From 10ca841a95747ffb4af05d5c91ddafae98571eb2 Mon Sep 17 00:00:00 2001
From: Glauber Costa <glommer@redhat.com>
Date: Tue, 20 Oct 2009 16:39:04 -0200
Subject: use upstream kvm_vcpu_ioctl

Signed-off-by: Glauber Costa <glommer@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
---
 kvm-all.c | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'kvm-all.c')

diff --git a/kvm-all.c b/kvm-all.c
index 5e03cd944..d02e94b08 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -865,7 +865,6 @@ int kvm_vm_ioctl(KVMState *s, int type, ...)
     return ret;
 }
 
-#ifdef KVM_UPSTREAM
 int kvm_vcpu_ioctl(CPUState *env, int type, ...)
 {
     int ret;
@@ -883,8 +882,6 @@ int kvm_vcpu_ioctl(CPUState *env, int type, ...)
     return ret;
 }
 
-#endif
-
 int kvm_has_sync_mmu(void)
 {
 #ifdef KVM_CAP_SYNC_MMU
-- 
cgit v1.2.3-18-g5258