summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlauber Costa <glommer@redhat.com>2009-07-24 14:01:55 -0400
committerAvi Kivity <avi@redhat.com>2009-08-04 11:35:19 +0300
commit18d32b52e3043fe15ab55e830855e7c1dbaab809 (patch)
tree5651211e3ea86c36800e55a15806d282df1dc143 /kvm-all.c
parentUse coalesced_mmio field from qemu upstream (diff)
downloadqemu-kvm-18d32b52e3043fe15ab55e830855e7c1dbaab809.tar.gz
qemu-kvm-18d32b52e3043fe15ab55e830855e7c1dbaab809.tar.bz2
qemu-kvm-18d32b52e3043fe15ab55e830855e7c1dbaab809.zip
Use coalesce memory regions functions from upstream
Delete ours, they do the same thing. 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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kvm-all.c b/kvm-all.c
index f17bf91d0..c62b0e714 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -360,6 +360,7 @@ int kvm_physical_sync_dirty_bitmap(target_phys_addr_t start_addr,
return ret;
}
+#endif
int kvm_coalesce_mmio_region(target_phys_addr_t start, ram_addr_t size)
{
@@ -399,7 +400,6 @@ int kvm_uncoalesce_mmio_region(target_phys_addr_t start, ram_addr_t size)
return ret;
}
-#endif
int kvm_check_extension(KVMState *s, unsigned int extension)
{
int ret;