Patchwork [05/12] kvm: ppc: Drop CONFIG_KVM_PPC_PVR

login
register
mail settings
Submitter Jan Kiszka
Date June 8, 2011, 2:10 p.m.
Message ID <1c9a696e32c2ef483758b52fb2ce2e1398fcaeff.1307542247.git.jan.kiszka@siemens.com>
Download mbox | patch
Permalink /patch/99442/
State New
Headers show

Comments

Jan Kiszka - June 8, 2011, 2:10 p.m.
Required header support is now unconditionally available.

CC: Alexander Graf <agraf@suse.de>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 configure        |    1 -
 target-ppc/kvm.c |    9 ---------
 2 files changed, 0 insertions(+), 10 deletions(-)
Alexander Graf - June 14, 2011, 11:06 a.m.
On 08.06.2011, at 16:10, Jan Kiszka wrote:

> Required header support is now unconditionally available.

Looks good to me :)

Reviewed-by: Alexander Graf <agraf@suse.de>


Alex

Patch

diff --git a/configure b/configure
index ed54db9..0947f98 100755
--- a/configure
+++ b/configure
@@ -3221,7 +3221,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 e7b1b10..0500e3f 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);
 }