From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50566) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGTf0-0002y6-Oa for qemu-devel@nongnu.org; Wed, 28 Jan 2015 09:32:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YGTeo-0005Z4-Nu for qemu-devel@nongnu.org; Wed, 28 Jan 2015 09:32:02 -0500 Received: from e06smtp10.uk.ibm.com ([195.75.94.106]:57326) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGTeo-0005Yk-DV for qemu-devel@nongnu.org; Wed, 28 Jan 2015 09:31:50 -0500 Received: from /spool/local by e06smtp10.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 28 Jan 2015 14:31:49 -0000 Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id 18D6017D8056 for ; Wed, 28 Jan 2015 14:31:52 +0000 (GMT) Received: from d06av06.portsmouth.uk.ibm.com (d06av06.portsmouth.uk.ibm.com [9.149.37.217]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t0SEVkQd54329448 for ; Wed, 28 Jan 2015 14:31:46 GMT Received: from d06av06.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av06.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t0S9Rdsb029243 for ; Wed, 28 Jan 2015 04:27:39 -0500 From: Cornelia Huck Date: Wed, 28 Jan 2015 15:31:34 +0100 Message-Id: <1422455498-889-6-git-send-email-cornelia.huck@de.ibm.com> In-Reply-To: <1422455498-889-1-git-send-email-cornelia.huck@de.ibm.com> References: <1422455498-889-1-git-send-email-cornelia.huck@de.ibm.com> Subject: [Qemu-devel] [PATCH 5/9] s390x/kvm: Fix diag-308 register decoding List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Cornelia Huck , borntraeger@de.ibm.com, jfrei@linux.vnet.ibm.com, agraf@suse.de, Thomas Huth From: Thomas Huth Fix the decoding of the r1 register number in the diagnose 308 handler. Signed-off-by: Thomas Huth Reviewed-by: Michael Mueller Signed-off-by: Cornelia Huck --- target-s390x/kvm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index dcd7505..6bf2719 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -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); } -- 1.7.9.5