From 0bed3bba7d68b35e4b0c63d597b377c49a14e509 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Wed, 8 Jun 2011 16:10:59 +0200 Subject: [PATCH] kvm: ppc: Drop CONFIG_KVM_PPC_PVR Required header support is now unconditionally available. CC: Alexander Graf Signed-off-by: Jan Kiszka Reviewed-by: Alexander Graf Signed-off-by: Marcelo Tosatti --- configure | 1 - target-ppc/kvm.c | 9 --------- 2 files changed, 10 deletions(-) diff --git a/configure b/configure index ebd5d56679..3286e33d28 100755 --- a/configure +++ b/configure @@ -3226,7 +3226,6 @@ case "$target_arch2" in if test $vhost_net = "yes" ; then echo "CONFIG_VHOST_NET=y" >> $config_target_mak fi - echo "CONFIG_KVM_PPC_PVR=y" >> $config_target_mak fi esac if test "$target_bigendian" = "yes" ; then diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c index e7b1b10c69..0500e3f772 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -104,21 +104,12 @@ static int kvm_arch_sync_sregs(CPUState *cenv) } } -#if !defined(CONFIG_KVM_PPC_PVR) - if (1) { - fprintf(stderr, "kvm error: missing PVR setting capability\n"); - return -ENOSYS; - } -#endif - ret = kvm_vcpu_ioctl(cenv, KVM_GET_SREGS, &sregs); if (ret) { return ret; } -#ifdef CONFIG_KVM_PPC_PVR sregs.pvr = cenv->spr[SPR_PVR]; -#endif return kvm_vcpu_ioctl(cenv, KVM_SET_SREGS, &sregs); }