OSDN Git Service

s390x/kvm: Fix diag-308 register decoding
authorThomas Huth <thuth@linux.vnet.ibm.com>
Mon, 8 Dec 2014 13:19:13 +0000 (14:19 +0100)
committerCornelia Huck <cornelia.huck@de.ibm.com>
Tue, 3 Feb 2015 12:42:40 +0000 (13:42 +0100)
Fix the decoding of the r1 register number in the diagnose 308 handler.

Signed-off-by: Thomas Huth <thuth@linux.vnet.ibm.com>
Reviewed-by: Michael Mueller <mimu@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
target-s390x/kvm.c

index dcd7505..6bf2719 100644 (file)
@@ -1046,7 +1046,7 @@ static void kvm_handle_diag_308(S390CPU *cpu, struct kvm_run *run)
     uint64_t r1, r3;
 
     cpu_synchronize_state(CPU(cpu));
-    r1 = (run->s390_sieic.ipa & 0x00f0) >> 8;
+    r1 = (run->s390_sieic.ipa & 0x00f0) >> 4;
     r3 = run->s390_sieic.ipa & 0x000f;
     handle_diag_308(&cpu->env, r1, r3);
 }