diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-20 22:09:37 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-20 23:01:08 -0500 |
| commit | 7267c0947d7e8ae5dff7bafd932c3bc285f43e5c (patch) | |
| tree | 9aa05d6e05ed83e67bf014f6745a3081b8407dc5 /hw/vga-isa-mm.c | |
| parent | 14015304b662e8f8ccce46c5a6927af6a14c510b (diff) | |
Use glib memory allocation and free functions
qemu_malloc/qemu_free no longer exist after this commit.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/vga-isa-mm.c')
| -rw-r--r-- | hw/vga-isa-mm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/vga-isa-mm.c b/hw/vga-isa-mm.c index 96e6e7dd21..b93497803c 100644 --- a/hw/vga-isa-mm.c +++ b/hw/vga-isa-mm.c @@ -102,11 +102,11 @@ static void vga_mm_init(ISAVGAMMState *s, target_phys_addr_t vram_base, MemoryRegion *s_ioport_ctrl, *vga_io_memory; s->it_shift = it_shift; - s_ioport_ctrl = qemu_malloc(sizeof(*s_ioport_ctrl)); + s_ioport_ctrl = g_malloc(sizeof(*s_ioport_ctrl)); memory_region_init_io(s_ioport_ctrl, &vga_mm_ctrl_ops, s, "vga-mm-ctrl", 0x100000); - vga_io_memory = qemu_malloc(sizeof(*vga_io_memory)); + vga_io_memory = g_malloc(sizeof(*vga_io_memory)); /* XXX: endianness? */ memory_region_init_io(vga_io_memory, &vga_mem_ops, &s->vga, "vga-mem", 0x20000); @@ -125,7 +125,7 @@ int isa_vga_mm_init(target_phys_addr_t vram_base, { ISAVGAMMState *s; - s = qemu_mallocz(sizeof(*s)); + s = g_malloc0(sizeof(*s)); vga_common_init(&s->vga, VGA_RAM_SIZE); vga_mm_init(s, vram_base, ctrl_base, it_shift); |