From patchwork Mon Jul 15 19:57:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Borntraeger X-Patchwork-Id: 259259 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6268A2C0178 for ; Tue, 16 Jul 2013 06:01:07 +1000 (EST) Received: from localhost ([::1]:53292 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UyoxF-0004wq-GK for incoming@patchwork.ozlabs.org; Mon, 15 Jul 2013 16:01:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43536) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uyotn-0007uS-PW for qemu-devel@nongnu.org; Mon, 15 Jul 2013 15:57:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uyotl-0006GR-Gz for qemu-devel@nongnu.org; Mon, 15 Jul 2013 15:57:31 -0400 Received: from e06smtp17.uk.ibm.com ([195.75.94.113]:53700) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uyotl-0006Fr-6o for qemu-devel@nongnu.org; Mon, 15 Jul 2013 15:57:29 -0400 Received: from /spool/local by e06smtp17.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 15 Jul 2013 20:53:10 +0100 Received: from d06dlp02.portsmouth.uk.ibm.com (9.149.20.14) by e06smtp17.uk.ibm.com (192.168.101.147) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 15 Jul 2013 20:53:07 +0100 Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id 40CBC219005F for ; Mon, 15 Jul 2013 21:01:24 +0100 (BST) Received: from d06av06.portsmouth.uk.ibm.com (d06av06.portsmouth.uk.ibm.com [9.149.37.217]) by b06cxnps4074.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r6FJvEma54329510 for ; Mon, 15 Jul 2013 19:57:14 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 r6FJvOVa012787 for ; Mon, 15 Jul 2013 13:57:25 -0600 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d06av06.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id r6FJvOKx012784; Mon, 15 Jul 2013 13:57:24 -0600 Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 25651) id 9574B1224437; Mon, 15 Jul 2013 21:57:24 +0200 (CEST) From: Christian Borntraeger To: Alexander Graf Date: Mon, 15 Jul 2013 21:57:42 +0200 Message-Id: <1373918265-20172-5-git-send-email-borntraeger@de.ibm.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1373918265-20172-1-git-send-email-borntraeger@de.ibm.com> References: <1373918265-20172-1-git-send-email-borntraeger@de.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13071519-0542-0000-0000-000005D05682 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 195.75.94.113 Cc: Cornelia Huck , Christian Borntraeger , Thomas Huth , =?UTF-8?q?Andreas=20F=C3=A4rber?= , qemu-devel Subject: [Qemu-devel] [PATCH 4/7] s390x/ioinst: Fixed alignment check in SCHM instruction 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 Register 2 only has to be aligned to a 32-byte boundary, not a full page boundary. Signed-off-by: Thomas Huth Acked-by: Cornelia Huck Signed-off-by: Christian Borntraeger --- target-s390x/ioinst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target-s390x/ioinst.c b/target-s390x/ioinst.c index 0dc258f..098bd8d 100644 --- a/target-s390x/ioinst.c +++ b/target-s390x/ioinst.c @@ -688,7 +688,7 @@ int ioinst_handle_schm(CPUS390XState *env, uint64_t reg1, uint64_t reg2, update = SCHM_REG1_UPD(reg1); dct = SCHM_REG1_DCT(reg1); - if (update && (reg2 & 0x0000000000000fff)) { + if (update && (reg2 & 0x000000000000001f)) { program_interrupt(env, PGM_OPERAND, 2); return -EIO; }