Message ID | 1393579866-43465-11-git-send-email-borntraeger@de.ibm.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> 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 916DC2C0086 for <incoming@patchwork.ozlabs.org>; Fri, 28 Feb 2014 20:32:04 +1100 (EST) Received: from localhost ([::1]:49941 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1WJJnW-0002ln-5g for incoming@patchwork.ozlabs.org; Fri, 28 Feb 2014 04:32:02 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51913) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <borntraeger@de.ibm.com>) id 1WJJmi-0002V0-J3 for qemu-devel@nongnu.org; Fri, 28 Feb 2014 04:31:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <borntraeger@de.ibm.com>) id 1WJJmR-0004lJ-QA for qemu-devel@nongnu.org; Fri, 28 Feb 2014 04:31:12 -0500 Received: from e06smtp15.uk.ibm.com ([195.75.94.111]:44691) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <borntraeger@de.ibm.com>) id 1WJJmR-0004kq-GV for qemu-devel@nongnu.org; Fri, 28 Feb 2014 04:30:55 -0500 Received: from /spool/local by e06smtp15.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for <qemu-devel@nongnu.org> from <borntraeger@de.ibm.com>; Fri, 28 Feb 2014 09:30:54 -0000 Received: from d06dlp01.portsmouth.uk.ibm.com (9.149.20.13) by e06smtp15.uk.ibm.com (192.168.101.145) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 28 Feb 2014 09:30:52 -0000 Received: from b06cxnps3075.portsmouth.uk.ibm.com (d06relay10.portsmouth.uk.ibm.com [9.149.109.195]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id 733EA17D805F for <qemu-devel@nongnu.org>; Fri, 28 Feb 2014 09:31:25 +0000 (GMT) Received: from d06av10.portsmouth.uk.ibm.com (d06av10.portsmouth.uk.ibm.com [9.149.37.251]) by b06cxnps3075.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s1S9Udvo65208570 for <qemu-devel@nongnu.org>; Fri, 28 Feb 2014 09:30:39 GMT Received: from d06av10.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av10.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s1S9UopK032312 for <qemu-devel@nongnu.org>; Fri, 28 Feb 2014 02:30:51 -0700 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d06av10.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id s1S9Un6k032250; Fri, 28 Feb 2014 02:30:50 -0700 Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 25651) id 2FC33122443E; Fri, 28 Feb 2014 10:30:50 +0100 (CET) From: Christian Borntraeger <borntraeger@de.ibm.com> To: qemu-devel <qemu-devel@nongnu.org>, Anthony Liguori <anthony@codemonkey.ws>, Peter Maydell <peter.maydell@linaro.org> Date: Fri, 28 Feb 2014 10:30:54 +0100 Message-Id: <1393579866-43465-11-git-send-email-borntraeger@de.ibm.com> X-Mailer: git-send-email 1.8.4.2 In-Reply-To: <1393579866-43465-1-git-send-email-borntraeger@de.ibm.com> References: <1393579866-43465-1-git-send-email-borntraeger@de.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14022809-0342-0000-0000-000007F5803B X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 195.75.94.111 Cc: Thomas Huth <thuth@linux.vnet.ibm.com>, Alexander Graf <agraf@suse.de>, Christian Borntraeger <borntraeger@de.ibm.com>, Jens Freimann <jfrei@linux.vnet.ibm.com>, Cornelia Huck <cornelia.huck@de.ibm.com>, Richard Henderson <rth@twiddle.net> Subject: [Qemu-devel] [PULL 10/22] s390x/sclp: Fixed setting of condition code register X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org |
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index e7b3b13..d3f0d4a 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -451,8 +451,9 @@ static int kvm_sclp_service_call(S390CPU *cpu, struct kvm_run *run, r = sclp_service_call(env, sccb, code); if (r < 0) { enter_pgmcheck(cpu, -r); + } else { + setcc(cpu, r); } - setcc(cpu, r); return 0; }