aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlauber Costa <glommer@redhat.com>2009-07-24 13:46:26 -0400
committerAvi Kivity <avi@redhat.com>2009-08-04 11:35:47 +0300
commit723df6dfbbeaf9998502c05048eecc053cc5a252 (patch)
tree62883a845b9e3a5bbd901ae246ecafce711272b0 /kvm-all.c
parentUse coalesce memory regions functions from upstream (diff)
downloadqemu-kvm-723df6dfbbeaf9998502c05048eecc053cc5a252.tar.gz
qemu-kvm-723df6dfbbeaf9998502c05048eecc053cc5a252.tar.bz2
qemu-kvm-723df6dfbbeaf9998502c05048eecc053cc5a252.zip
Use kvm_has_sync_mmu from upstream
they have it, and it does the same as we do. Signed-off-by: Glauber Costa <glommer@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'kvm-all.c')
-rw-r--r--kvm-all.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/kvm-all.c b/kvm-all.c
index c62b0e714..794ac2c0a 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -864,6 +864,8 @@ int kvm_vcpu_ioctl(CPUState *env, int type, ...)
return ret;
}
+#endif
+
int kvm_has_sync_mmu(void)
{
#ifdef KVM_CAP_SYNC_MMU
@@ -875,6 +877,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()) {