diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2011-06-08 16:10:59 +0200 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2011-06-20 15:17:33 -0300 |
| commit | 0bed3bba7d68b35e4b0c63d597b377c49a14e509 (patch) | |
| tree | 0f7d82c57dad6bd5d03af88947e6b87e18967f1d | |
| parent | 5802e066ebcca382dbb81df3417930ee23873252 (diff) | |
| download | focaccia-qemu-0bed3bba7d68b35e4b0c63d597b377c49a14e509.tar.gz focaccia-qemu-0bed3bba7d68b35e4b0c63d597b377c49a14e509.zip | |
kvm: ppc: Drop CONFIG_KVM_PPC_PVR
Required header support is now unconditionally available. CC: Alexander Graf <agraf@suse.de> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Reviewed-by: Alexander Graf <agraf@suse.de> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | target-ppc/kvm.c | 9 |
2 files changed, 0 insertions, 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); } |