diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2012-10-30 00:35:43 +0100 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2012-10-30 00:35:43 +0100 |
| commit | 38c4718392fda2bda1e084366b9aa41b49b9d8cf (patch) | |
| tree | 881cb519ffcebc0b458bcbb92338297da19cb914 /target-s390x/cpu.h | |
| parent | 3585317f6fdff0e3ae082f88afb2784d815a07e2 (diff) | |
| parent | 130c57c036fdc2eba8936da1b1dad39e78d5ea32 (diff) | |
| download | focaccia-qemu-38c4718392fda2bda1e084366b9aa41b49b9d8cf.tar.gz focaccia-qemu-38c4718392fda2bda1e084366b9aa41b49b9d8cf.zip | |
Merge branch 's390-for-upstream' of git://repo.or.cz/qemu/agraf
* 's390-for-upstream' of git://repo.or.cz/qemu/agraf: s390: sclp ascii console support s390: sclp signal quiesce support s390: sclp event support s390: sclp base support s390: use sync regs for register transfer s390/kvm_stat: correct sys_perf_event_open syscall number s390x: fix -initrd in virtio machine
Diffstat (limited to 'target-s390x/cpu.h')
| -rw-r--r-- | target-s390x/cpu.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h index 9997765dd1..5be6e83528 100644 --- a/target-s390x/cpu.h +++ b/target-s390x/cpu.h @@ -596,17 +596,6 @@ static inline const char *cc_name(int cc_op) return cc_names[cc_op]; } -/* SCLP PV interface defines */ -#define SCLP_CMDW_READ_SCP_INFO 0x00020001 -#define SCLP_CMDW_READ_SCP_INFO_FORCED 0x00120001 - -#define SCP_LENGTH 0x00 -#define SCP_FUNCTION_CODE 0x02 -#define SCP_CONTROL_MASK 0x03 -#define SCP_RESPONSE_CODE 0x06 -#define SCP_MEM_CODE 0x08 -#define SCP_INCREMENT 0x0a - typedef struct LowCore { /* prefix area: defined by architecture */ @@ -955,7 +944,7 @@ static inline void ebcdic_put(uint8_t *p, const char *ascii, int len) void load_psw(CPUS390XState *env, uint64_t mask, uint64_t addr); int mmu_translate(CPUS390XState *env, target_ulong vaddr, int rw, uint64_t asc, target_ulong *raddr, int *flags); -int sclp_service_call(CPUS390XState *env, uint32_t sccb, uint64_t code); +int sclp_service_call(uint32_t sccb, uint64_t code); uint32_t calc_cc(CPUS390XState *env, uint32_t cc_op, uint64_t src, uint64_t dst, uint64_t vr); |