From patchwork Wed Jan 28 14:31:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cornelia Huck X-Patchwork-Id: 433876 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 373121401AC for ; Thu, 29 Jan 2015 01:36:50 +1100 (AEDT) Received: from localhost ([::1]:53839 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGTjc-0002vz-C7 for incoming@patchwork.ozlabs.org; Wed, 28 Jan 2015 09:36:48 -0500 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 d06dlp01.portsmouth.uk.ibm.com (9.149.20.13) by e06smtp10.uk.ibm.com (192.168.101.140) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 28 Jan 2015 14:31:47 -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 Received: from gondolin.boeblingen.de.ibm.com (dyn-9-152-224-150.boeblingen.de.ibm.com [9.152.224.150]) by d06av06.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id t0S9RZ5m028952; Wed, 28 Jan 2015 04:27:39 -0500 From: Cornelia Huck To: qemu-devel@nongnu.org Date: Wed, 28 Jan 2015 15:31:34 +0100 Message-Id: <1422455498-889-6-git-send-email-cornelia.huck@de.ibm.com> X-Mailer: git-send-email 1.7.9.5 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> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15012814-0041-0000-0000-0000030EF443 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 195.75.94.106 Cc: Cornelia Huck , borntraeger@de.ibm.com, jfrei@linux.vnet.ibm.com, agraf@suse.de, Thomas Huth Subject: [Qemu-devel] [PATCH 5/9] s390x/kvm: Fix diag-308 register decoding X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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); }