[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/22] s390x/sclp: Fixed the size of sccb and code pa
From: |
Christian Borntraeger |
Subject: |
[Qemu-devel] [PULL 08/22] s390x/sclp: Fixed the size of sccb and code parameter |
Date: |
Fri, 28 Feb 2014 10:30:52 +0100 |
From: Thomas Huth <address@hidden>
The pointer to the SCCB should not be limited to 32 bits only.
In contrast to this, the command word parameter is only 32 bits
(the upper 32 bits should be ignored).
Signed-off-by: Thomas Huth <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>
---
hw/s390x/sclp.c | 4 ++--
target-s390x/cpu.h | 2 +-
target-s390x/kvm.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c
index 4e0c564..6134d4f 100644
--- a/hw/s390x/sclp.c
+++ b/hw/s390x/sclp.c
@@ -89,7 +89,7 @@ static void sclp_read_cpu_info(SCCB *sccb)
sccb->h.response_code = cpu_to_be16(SCLP_RC_NORMAL_READ_COMPLETION);
}
-static void sclp_execute(SCCB *sccb, uint64_t code)
+static void sclp_execute(SCCB *sccb, uint32_t code)
{
S390SCLPDevice *sdev = get_event_facility();
@@ -107,7 +107,7 @@ static void sclp_execute(SCCB *sccb, uint64_t code)
}
}
-int sclp_service_call(uint32_t sccb, uint64_t code)
+int sclp_service_call(uint64_t sccb, uint32_t code)
{
int r = 0;
SCCB work_sccb;
diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h
index b09ff92..373c115 100644
--- a/target-s390x/cpu.h
+++ b/target-s390x/cpu.h
@@ -963,7 +963,7 @@ struct sysib_322 {
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(uint32_t sccb, uint64_t code);
+int sclp_service_call(uint64_t sccb, uint32_t code);
uint32_t calc_cc(CPUS390XState *env, uint32_t cc_op, uint64_t src, uint64_t
dst,
uint64_t vr);
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index 2fa374a..9e1083e 100644
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -440,8 +440,8 @@ static int kvm_sclp_service_call(S390CPU *cpu, struct
kvm_run *run,
uint16_t ipbh0)
{
CPUS390XState *env = &cpu->env;
- uint32_t sccb;
- uint64_t code;
+ uint64_t sccb;
+ uint32_t code;
int r = 0;
cpu_synchronize_state(CPU(cpu));
--
1.8.4.2
- [Qemu-devel] [PULL 00/22] s390/kvm: features, fixes and cleanups for 2.0, Christian Borntraeger, 2014/02/28
- [Qemu-devel] [PULL 03/22] s390x/async_pf: Check for apf extension and enable pfault, Christian Borntraeger, 2014/02/28
- [Qemu-devel] [PULL 06/22] s390x/virtio-hcall: Specification exception for illegal subcodes, Christian Borntraeger, 2014/02/28
- [Qemu-devel] [PULL 05/22] s390x/virtio-hcall: Add range check for hypervisor call, Christian Borntraeger, 2014/02/28
- [Qemu-devel] [PULL 09/22] s390x/sclp: Add missing checks to SCLP handler, Christian Borntraeger, 2014/02/28
- [Qemu-devel] [PULL 15/22] s390-ccw.img: Fix sporadic reboot hangs: Initialize next_idx, Christian Borntraeger, 2014/02/28
- [Qemu-devel] [PULL 10/22] s390x/sclp: Fixed setting of condition code register, Christian Borntraeger, 2014/02/28
- [Qemu-devel] [PULL 01/22] update linux headers to kvm/next, Christian Borntraeger, 2014/02/28
- [Qemu-devel] [PULL 08/22] s390x/sclp: Fixed the size of sccb and code parameter,
Christian Borntraeger <=
- [Qemu-devel] [PULL 11/22] s390x/event-facility: some renaming, Christian Borntraeger, 2014/02/28
- [Qemu-devel] [PULL 17/22] s390-ccw.img: new binary rom to match latest fixes, Christian Borntraeger, 2014/02/28
- [Qemu-devel] [PULL 12/22] s390x/event-facility: code restructure, Christian Borntraeger, 2014/02/28
- [Qemu-devel] [PULL 16/22] s390-ccw.img: Fix sporadic errors with ccw boot image - initialize css, Christian Borntraeger, 2014/02/28
- [Qemu-devel] [PULL 20/22] s390x/kvm: Add missing SIGP CPU RESET order, Christian Borntraeger, 2014/02/28
- [Qemu-devel] [PULL 02/22] s390x/kvm: implement floating-interrupt controller device, Christian Borntraeger, 2014/02/28
- [Qemu-devel] [PULL 07/22] s390x/eventfacility: mask out commands, Christian Borntraeger, 2014/02/28
- [Qemu-devel] [PULL 21/22] s390x/kvm: Rework priv instruction handlers, Christian Borntraeger, 2014/02/28
- [Qemu-devel] [PULL 14/22] s390x/event-facility: exploit realize/unrealize, Christian Borntraeger, 2014/02/28
- [Qemu-devel] [PULL 19/22] s390x/kvm: Rework SIGP INITIAL CPU RESET handler, Christian Borntraeger, 2014/02/28