[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/15] kvm: ppc: Drop CONFIG_KVM_PPC_PVR
From: |
Marcelo Tosatti |
Subject: |
[Qemu-devel] [PATCH 06/15] kvm: ppc: Drop CONFIG_KVM_PPC_PVR |
Date: |
Tue, 21 Jun 2011 14:07:55 -0300 |
From: Jan Kiszka <address@hidden>
Required header support is now unconditionally available.
CC: Alexander Graf <address@hidden>
Signed-off-by: Jan Kiszka <address@hidden>
Reviewed-by: Alexander Graf <address@hidden>
Signed-off-by: Marcelo Tosatti <address@hidden>
---
configure | 1 -
target-ppc/kvm.c | 9 ---------
2 files changed, 0 insertions(+), 10 deletions(-)
diff --git a/configure b/configure
index ebd5d56..3286e33 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 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);
}
--
1.7.5.4
- [Qemu-devel] [PATCH 00/15] [PULL] qemu-kvm.git uq/master queue, Marcelo Tosatti, 2011/06/21
- [Qemu-devel] [PATCH 06/15] kvm: ppc: Drop CONFIG_KVM_PPC_PVR,
Marcelo Tosatti <=
- [Qemu-devel] [PATCH 12/15] kvm: x86: Pass KVMState to kvm_arch_get_supported_cpuid, Marcelo Tosatti, 2011/06/21
- [Qemu-devel] [PATCH 07/15] kvm: Drop useless zero-initializations, Marcelo Tosatti, 2011/06/21
- [Qemu-devel] [PATCH 10/15] kvm: ppc: Drop KVM_CAP build dependencies, Marcelo Tosatti, 2011/06/21
- [Qemu-devel] [PATCH 08/15] kvm: Drop KVM_CAP build dependencies, Marcelo Tosatti, 2011/06/21
- [Qemu-devel] [PATCH 11/15] kvm: Clean up stubs, Marcelo Tosatti, 2011/06/21
- [Qemu-devel] [PATCH 13/15] Remove unneeded kvm.h from cpu-exec.c, Marcelo Tosatti, 2011/06/21
- [Qemu-devel] [PATCH 05/15] kvm: Drop CONFIG_KVM_PARA, Marcelo Tosatti, 2011/06/21
- [Qemu-devel] [PATCH 14/15] KVM: Fix XSAVE feature bit enumeration, Marcelo Tosatti, 2011/06/21
- [Qemu-devel] [PATCH 01/15] kvm: x86: Save/restore FPU OP, IP and DP, Marcelo Tosatti, 2011/06/21
- [Qemu-devel] [PATCH 04/15] Switch build system to accompanied kernel headers, Marcelo Tosatti, 2011/06/21