From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=58534 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q4YzY-00010y-9P for qemu-devel@nongnu.org; Tue, 29 Mar 2011 09:29:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q4YzW-0006V0-Sy for qemu-devel@nongnu.org; Tue, 29 Mar 2011 09:29:51 -0400 Received: from cantor.suse.de ([195.135.220.2]:48626 helo=mx1.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q4YzW-0006UP-G3 for qemu-devel@nongnu.org; Tue, 29 Mar 2011 09:29:50 -0400 From: Alexander Graf Date: Tue, 29 Mar 2011 15:29:30 +0200 Message-Id: <1301405386-25738-4-git-send-email-agraf@suse.de> In-Reply-To: <1301405386-25738-1-git-send-email-agraf@suse.de> References: <1301405386-25738-1-git-send-email-agraf@suse.de> Subject: [Qemu-devel] [PATCH 03/19] s390x: fix KVM target List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Jan Kiszka , aurelien@aurel32.net, rth@twiddle.net During Jan's rework of the generic KVM layer, he added some more error checks and actually aborted if something went wrong. Unfortunately, one of the s390 internal error codes slipped through, aborting the VM without needing to. This patch fixes booting of S390x virtual machines in KVM. Signed-off-by: Alexander Graf CC: Jan Kiszka --- target-s390x/kvm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index 9123203..ae7dc56 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -441,7 +441,7 @@ static int handle_instruction(CPUState *env, struct kvm_run *run) if (r < 0) { enter_pgmcheck(env, 0x0001); } - return r; + return 0; } static int handle_intercept(CPUState *env) -- 1.6.0.2