diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2011-11-19 11:17:58 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2011-11-19 11:17:58 +0000 |
| commit | 25cc4a768d91817bc3b4bf9b3a270c4791509cd7 (patch) | |
| tree | 78a65c66213c777fd87d68192ab82bc0f80b6d1e /target-s390x/cpu.h | |
| parent | 05a86f23e5ca83348eface349429341cefb8697b (diff) | |
| parent | 326384d5b6dcea69ca44695ee807f8b50234ab71 (diff) | |
| download | focaccia-qemu-25cc4a768d91817bc3b4bf9b3a270c4791509cd7.tar.gz focaccia-qemu-25cc4a768d91817bc3b4bf9b3a270c4791509cd7.zip | |
Merge branch 's390-1.0' of git://repo.or.cz/qemu/agraf
* 's390-1.0' of git://repo.or.cz/qemu/agraf: s390x: initialize virtio dev region tcg: Use TCGReg for standard tcg-target entry points. tcg: Standardize on TCGReg as the enum for hard registers s390x: Add shutdown for TCG s390-virtio machine s390: Fix cpu shutdown for KVM s390: fix short kernel command lines s390: fix reset hypercall to reset the status s390x: implement SIGP restart and shutdown s390x: implement rrbe instruction properly s390x: update R and C bits in storage key s390x: make ipte 31-bit aware s390x: add ldeb instruction
Diffstat (limited to 'target-s390x/cpu.h')
| -rw-r--r-- | target-s390x/cpu.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h index e192b50c73..202c098ee0 100644 --- a/target-s390x/cpu.h +++ b/target-s390x/cpu.h @@ -309,10 +309,21 @@ static inline void kvm_s390_interrupt_internal(CPUState *env, int type, } #endif CPUState *s390_cpu_addr2state(uint16_t cpu_addr); +void s390_add_running_cpu(CPUState *env); +unsigned s390_del_running_cpu(CPUState *env); /* from s390-virtio-bus */ extern const target_phys_addr_t virtio_size; +#else +static inline void s390_add_running_cpu(CPUState *env) +{ +} + +static inline unsigned s390_del_running_cpu(CPUState *env) +{ + return 0; +} #endif void cpu_lock(void); void cpu_unlock(void); @@ -819,6 +830,10 @@ struct sysib_322 { #define _PAGE_RO 0x200 /* HW read-only bit */ #define _PAGE_INVALID 0x400 /* HW invalid bit */ +#define SK_C (0x1 << 1) +#define SK_R (0x1 << 2) +#define SK_F (0x1 << 3) +#define SK_ACC_MASK (0xf << 4) /* EBCDIC handling */ |