[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/5] s390x/kvm: Fix opcode decoding for eb instructio
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL 1/5] s390x/kvm: Fix opcode decoding for eb instruction handler |
Date: |
Wed, 5 Nov 2014 16:48:12 +0100 |
From: Frank Blaschka <address@hidden>
The second byte of the opcode is encoded in the lowest byte of the ipb
field, not the lowest byte of the ipa field.
Signed-off-by: Frank Blaschka <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
---
target-s390x/kvm.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index 5b10a25..690cb71 100644
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -827,18 +827,18 @@ static int handle_b9(S390CPU *cpu, struct kvm_run *run,
uint8_t ipa1)
return r;
}
-static int handle_eb(S390CPU *cpu, struct kvm_run *run, uint8_t ipa1)
+static int handle_eb(S390CPU *cpu, struct kvm_run *run, uint8_t ipbl)
{
int r = 0;
- switch (ipa1) {
+ switch (ipbl) {
case PRIV_EB_SQBS:
/* just inject exception */
r = -1;
break;
default:
r = -1;
- DPRINTF("KVM: unhandled PRIV: 0xeb%x\n", ipa1);
+ DPRINTF("KVM: unhandled PRIV: 0xeb%x\n", ipbl);
break;
}
@@ -1039,7 +1039,7 @@ static int handle_instruction(S390CPU *cpu, struct
kvm_run *run)
r = handle_b9(cpu, run, ipa1);
break;
case IPA0_EB:
- r = handle_eb(cpu, run, ipa1);
+ r = handle_eb(cpu, run, run->s390_sieic.ipb & 0xff);
break;
case IPA0_DIAG:
r = handle_diag(cpu, run, run->s390_sieic.ipb);
--
1.7.9.5
- [Qemu-devel] [PULL 0/5] s390x fixes for 2.2, Cornelia Huck, 2014/11/05
- [Qemu-devel] [PULL 1/5] s390x/kvm: Fix opcode decoding for eb instruction handler,
Cornelia Huck <=
- [Qemu-devel] [PULL 3/5] s390x/sclpconsole-lm: truncate input if line is too long, Cornelia Huck, 2014/11/05
- [Qemu-devel] [PULL 5/5] s390x/sclpconsole: Avoid hanging SCLP ASCII console, Cornelia Huck, 2014/11/05
- [Qemu-devel] [PULL 2/5] s390x/kvm: Fix warning from sparse, Cornelia Huck, 2014/11/05
- [Qemu-devel] [PULL 4/5] s390x/sclpconsole-lm: Fix hanging SCLP line mode console, Cornelia Huck, 2014/11/05
- Re: [Qemu-devel] [PULL 0/5] s390x fixes for 2.2, Christian Borntraeger, 2014/11/10