Merge remote-tracking branch 'kraxel/usb.29' into staging

[qemu.git] / hw / isa_mmio.c

diff --git a/hw/isa_mmio.c b/hw/isa_mmio.c
index 3d2af1a63c3d04d94f6d070c00d92ab9ce0e3142..fd755ab4a8853bd75567cefbbb595ea2d943eb9b 100644 (file)
--- a/hw/isa_mmio.c
+++ b/hw/isa_mmio.c
@@ -74,7 +74,7 @@ void isa_mmio_setup(MemoryRegion *mr, target_phys_addr_t size)
 
 void isa_mmio_init(target_phys_addr_t base, target_phys_addr_t size)
 {
-    MemoryRegion *mr = qemu_malloc(sizeof(*mr));
+    MemoryRegion *mr = g_malloc(sizeof(*mr));
 
     isa_mmio_setup(mr, size);
     memory_region_add_subregion(get_system_memory(), base, mr);