Patchwork [03/19] s390x: fix KVM target

login
register
mail settings
Submitter Alexander Graf
Date March 29, 2011, 1:29 p.m.
Message ID <1301405386-25738-4-git-send-email-agraf@suse.de>
Download mbox | patch
Permalink /patch/88777/
State New
Headers show

Comments

Alexander Graf - March 29, 2011, 1:29 p.m.
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>
---
 target-s390x/kvm.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Patch

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)