[PATCH] use kvm_has_sync_mmu from upstream.

[PATCH] use kvm_has_sync_mmu from upstream.

[Glauber Costa]

they have it, and it does the same as we do.

Signed-off-by: Glauber Costa <glommer@redhat.com>
---
 kvm-all.c  |    3 +++
 qemu-kvm.c |    9 ---------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/kvm-all.c b/kvm-all.c
index b4b5a35..157b968 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -848,6 +848,8 @@ int kvm_vcpu_ioctl(CPUState *env, int type, ...)
     return ret;
 }
 
+#endif
+
 int kvm_has_sync_mmu(void)
 {
 #ifdef KVM_CAP_SYNC_MMU
@@ -859,6 +861,7 @@ int kvm_has_sync_mmu(void)
 #endif
 }
 
+#ifdef KVM_UPSTREAM
 void kvm_setup_guest_memory(void *start, size_t size)
 {
     if (!kvm_has_sync_mmu()) {
diff --git a/qemu-kvm.c b/qemu-kvm.c
index bca256c..fdf71a8 100644
--- a/qemu-kvm.c
+++ b/qemu-kvm.c
@@ -1152,15 +1152,6 @@ int kvm_pit_in_kernel(kvm_context_t kvm)
 	return kvm->pit_in_kernel;
 }
 
-int kvm_has_sync_mmu(void)
-{
-        int r = 0;
-#ifdef KVM_CAP_SYNC_MMU
-        r = kvm_ioctl(kvm_state, KVM_CHECK_EXTENSION, KVM_CAP_SYNC_MMU);
-#endif
-        return r;
-}
-
 int kvm_inject_nmi(kvm_vcpu_context_t vcpu)
 {
 #ifdef KVM_CAP_USER_NMI
-- 
1.6.2.2

Re: [PATCH] use kvm_has_sync_mmu from upstream.

[Avi Kivity]

On 07/24/2009 08:46 PM, Glauber Costa wrote:
> they have it, and it does the same as we do.
>    

Applied, thanks.

-- 
error compiling committee.c: too many arguments to function