From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46704) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIdEA-0001df-1D for qemu-devel@nongnu.org; Tue, 03 Feb 2015 08:09:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YIdE4-0005Uz-9L for qemu-devel@nongnu.org; Tue, 03 Feb 2015 08:09:13 -0500 Received: from e06smtp13.uk.ibm.com ([195.75.94.109]:55950) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIdE3-0005UV-VN for qemu-devel@nongnu.org; Tue, 03 Feb 2015 08:09:08 -0500 Received: from /spool/local by e06smtp13.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 3 Feb 2015 13:09:06 -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 5734717D8062 for ; Tue, 3 Feb 2015 13:09:11 +0000 (GMT) Received: from d06av04.portsmouth.uk.ibm.com (d06av04.portsmouth.uk.ibm.com [9.149.37.216]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t13D93q83473680 for ; Tue, 3 Feb 2015 13:09:03 GMT Received: from d06av04.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av04.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t13D90mX027574 for ; Tue, 3 Feb 2015 06:09:03 -0700 From: Cornelia Huck Date: Tue, 3 Feb 2015 14:08:44 +0100 Message-Id: <1422968928-9710-6-git-send-email-cornelia.huck@de.ibm.com> In-Reply-To: <1422968928-9710-1-git-send-email-cornelia.huck@de.ibm.com> References: <1422968928-9710-1-git-send-email-cornelia.huck@de.ibm.com> Subject: [Qemu-devel] [PULL 5/9] s390x/kvm: Fix diag-308 register decoding List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org Cc: Thomas Huth , qemu-devel@nongnu.org, agraf@suse.de, borntraeger@de.ibm.com, jfrei@linux.vnet.ibm.com, Cornelia Huck 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