From: Alexander Graf <agraf@suse.de>
Date: Tue, 29 Mar 2011 13:29:30 +0000 (+0200)
Subject: s390x: fix KVM target
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=359507eed1b6d8ae2392e0c8fe32d5f0de9d1d75;p=qemu.git

s390x: fix KVM target

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 <agraf@suse.de>
CC: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---

diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index 91232038ea..ae7dc561b3 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)