2012-03-04 00:28:15 +01:00
|
|
|
From f0fd80de8f15efc091751f2e9bf4c2276ba058b3 Mon Sep 17 00:00:00 2001
|
2012-01-10 16:43:02 +01:00
|
|
|
From: Alexander Graf <agraf@suse.de>
|
|
|
|
|
Date: Tue, 10 Jan 2012 16:25:27 +0100
|
2012-02-01 00:10:40 +01:00
|
|
|
Subject: [PATCH] PPC: KVM: Ignore SET_ONE_REG failures
|
2012-01-10 16:43:02 +01:00
|
|
|
|
|
|
|
|
The SET_ONE_REG interface didn't make it upstream in the form that is used
|
|
|
|
|
in qemu-1.0, so the code won't work. Make the error a warning, so we can
|
|
|
|
|
at least use the HV target.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Alexander Graf <agraf@suse.de>
|
|
|
|
|
---
|
|
|
|
|
target-ppc/kvm.c | 5 ++++-
|
|
|
|
|
1 files changed, 4 insertions(+), 1 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c
|
2012-03-04 00:28:15 +01:00
|
|
|
index 0410901..6c6278a 100644
|
2012-01-10 16:43:02 +01:00
|
|
|
--- a/target-ppc/kvm.c
|
|
|
|
|
+++ b/target-ppc/kvm.c
|
|
|
|
|
@@ -759,7 +759,10 @@ void kvmppc_set_papr(CPUState *env)
|
|
|
|
|
reg.u.reg64 = env->spr[SPR_HIOR];
|
|
|
|
|
ret = kvm_vcpu_ioctl(env, KVM_SET_ONE_REG, ®);
|
|
|
|
|
if (ret) {
|
|
|
|
|
- goto fail;
|
|
|
|
|
+ fprintf(stderr, "Couldn't set HIOR. Maybe you're running an old \n"
|
|
|
|
|
+ "kernel with support for HV KVM but no PAPR PR \n"
|
|
|
|
|
+ "KVM in which case things will work. If they don't \n"
|
|
|
|
|
+ "please update your host kernel!\n");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Set SDR1 so kernel space finds the HTAB */
|
