summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlauber Costa <glommer@redhat.com>2009-07-14 11:35:11 -0400
committerMarcelo Tosatti <mtosatti@redhat.com>2009-07-14 19:37:29 -0300
commit62a25d7fe75ef37e0223420ad42651d952e14cf3 (patch)
tree216add4515f46b93228c91f9171354e66348d147 /kvm-all.c
parentlibkvm: x86: fix memleak if ioctl fails (diff)
downloadqemu-kvm-62a25d7fe75ef37e0223420ad42651d952e14cf3.tar.gz
qemu-kvm-62a25d7fe75ef37e0223420ad42651d952e14cf3.tar.bz2
qemu-kvm-62a25d7fe75ef37e0223420ad42651d952e14cf3.zip
replace USE_KVM with CONFIG_KVM
Make things less confuse, and we have KVM_UPSTREAM to differentiate between the two versions anyway. kvm-all.c and kvm.c gets compiled now, but protected with KVM_UPSTREAM too, so no function in there gets visible in the final binary Signed-off-by: Glauber Costa <glommer@redhat.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'kvm-all.c')
-rw-r--r--kvm-all.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/kvm-all.c b/kvm-all.c
index 8567ac916..4c2fdf5e2 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -26,6 +26,7 @@
#include "gdbstub.h"
#include "kvm.h"
+#ifdef KVM_UPSTREAM
/* KVM uses PAGE_SIZE in it's definition of COALESCED_MMIO_MAX */
#define PAGE_SIZE TARGET_PAGE_SIZE
@@ -1027,3 +1028,4 @@ void kvm_remove_all_breakpoints(CPUState *current_env)
{
}
#endif /* !KVM_CAP_SET_GUEST_DEBUG */
+#endif