[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/8] s390x/kvm: Fix diagnose handling.
From: |
Alexander Graf |
Subject: |
[Qemu-devel] [PULL 1/8] s390x/kvm: Fix diagnose handling. |
Date: |
Wed, 18 Dec 2013 14:27:34 +0100 |
From: Cornelia Huck <address@hidden>
The instruction intercept handler for diagnose used only the displacement
when trying to calculate the function code. This is only correct for base
0, however; we need to perform a complete base/displacement address
calculation and use bits 48-63 as the function code.
Reviewed-by: Thomas Huth <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
Signed-off-by: Jens Freimann <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>
---
target-s390x/cpu.h | 3 +++
target-s390x/kvm.c | 19 +++++++++++++------
2 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h
index a2c077b..68b5ab7 100644
--- a/target-s390x/cpu.h
+++ b/target-s390x/cpu.h
@@ -352,6 +352,9 @@ static inline hwaddr decode_basedisp_s(CPUS390XState *env,
uint32_t ipb)
return addr;
}
+/* Base/displacement are at the same locations. */
+#define decode_basedisp_rs decode_basedisp_s
+
void s390x_tod_timer(void *opaque);
void s390x_cpu_timer(void *opaque);
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index 02ac4ba..b00a661 100644
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -562,11 +562,19 @@ static void kvm_handle_diag_308(S390CPU *cpu, struct
kvm_run *run)
handle_diag_308(&cpu->env, r1, r3);
}
-static int handle_diag(S390CPU *cpu, struct kvm_run *run, int ipb_code)
+#define DIAG_KVM_CODE_MASK 0x000000000000ffff
+
+static int handle_diag(S390CPU *cpu, struct kvm_run *run, uint32_t ipb)
{
int r = 0;
-
- switch (ipb_code) {
+ uint16_t func_code;
+
+ /*
+ * For any diagnose call we support, bits 48-63 of the resulting
+ * address specify the function code; the remainder is ignored.
+ */
+ func_code = decode_basedisp_rs(&cpu->env, ipb) & DIAG_KVM_CODE_MASK;
+ switch (func_code) {
case DIAG_IPL:
kvm_handle_diag_308(cpu, run);
break;
@@ -577,7 +585,7 @@ static int handle_diag(S390CPU *cpu, struct kvm_run *run,
int ipb_code)
sleep(10);
break;
default:
- DPRINTF("KVM: unknown DIAG: 0x%x\n", ipb_code);
+ DPRINTF("KVM: unknown DIAG: 0x%x\n", func_code);
r = -1;
break;
}
@@ -684,7 +692,6 @@ static void handle_instruction(S390CPU *cpu, struct kvm_run
*run)
{
unsigned int ipa0 = (run->s390_sieic.ipa & 0xff00);
uint8_t ipa1 = run->s390_sieic.ipa & 0x00ff;
- int ipb_code = (run->s390_sieic.ipb & 0x0fff0000) >> 16;
int r = -1;
DPRINTF("handle_instruction 0x%x 0x%x\n",
@@ -696,7 +703,7 @@ static void handle_instruction(S390CPU *cpu, struct kvm_run
*run)
r = handle_priv(cpu, run, ipa0 >> 8, ipa1);
break;
case IPA0_DIAG:
- r = handle_diag(cpu, run, ipb_code);
+ r = handle_diag(cpu, run, run->s390_sieic.ipb);
break;
case IPA0_SIGP:
r = handle_sigp(cpu, run, ipa1);
--
1.6.0.2
- [Qemu-devel] [PULL 0/8] s390 patch queue 2013-12-18, Alexander Graf, 2013/12/18
- [Qemu-devel] [PULL 4/8] s390x/kvm: Fix coding style in handle_sigp(), Alexander Graf, 2013/12/18
- [Qemu-devel] [PULL 1/8] s390x/kvm: Fix diagnose handling.,
Alexander Graf <=
- [Qemu-devel] [PULL 2/8] s390x/kvm: Removed duplicated SIGP defines, Alexander Graf, 2013/12/18
- [Qemu-devel] [PULL 6/8] s390x/kvm: Simplified the calculation of the SIGP order code, Alexander Graf, 2013/12/18
- [Qemu-devel] [PULL 5/8] s390x/kvm: Implemented SIGP START, Alexander Graf, 2013/12/18
- [Qemu-devel] [PULL 3/8] s390x/kvm: Removed s390_store_status stub, Alexander Graf, 2013/12/18
- [Qemu-devel] [PULL 8/8] s390x/ioinst: CHSC has to set a condition code, Alexander Graf, 2013/12/18
- [Qemu-devel] [PULL 7/8] s390x/kvm: Fixed condition code for unknown SIGP orders, Alexander Graf, 2013/12/18
- Re: [Qemu-devel] [PULL 0/8] s390 patch queue 2013-12-18, Anthony Liguori, 2013/12/19