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/blizzard.c | |
parent | 14015304b662e8f8ccce46c5a6927af6a14c510b (diff) | |
download | qemu-7267c0947d7e8ae5dff7bafd932c3bc285f43e5c.tar.gz qemu-7267c0947d7e8ae5dff7bafd932c3bc285f43e5c.tar.bz2 qemu-7267c0947d7e8ae5dff7bafd932c3bc285f43e5c.zip |
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/blizzard.c')
-rw-r--r-- | hw/blizzard.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/blizzard.c b/hw/blizzard.c index c5245504af..b2c1b22844 100644 --- a/hw/blizzard.c +++ b/hw/blizzard.c @@ -188,7 +188,7 @@ static int blizzard_transfer_setup(BlizzardState *s) s->data.len = s->bpp * s->data.dx * s->data.dy; s->data.pitch = s->data.dx; if (s->data.len > s->data.buflen) { - s->data.buf = qemu_realloc(s->data.buf, s->data.len); + s->data.buf = g_realloc(s->data.buf, s->data.len); s->data.buflen = s->data.len; } s->data.ptr = s->data.buf; @@ -953,9 +953,9 @@ static void blizzard_screen_dump(void *opaque, const char *filename) { void *s1d13745_init(qemu_irq gpio_int) { - BlizzardState *s = (BlizzardState *) qemu_mallocz(sizeof(*s)); + BlizzardState *s = (BlizzardState *) g_malloc0(sizeof(*s)); - s->fb = qemu_malloc(0x180000); + s->fb = g_malloc(0x180000); s->state = graphic_console_init(blizzard_update_display, blizzard_invalidate_display, @@ -964,7 +964,7 @@ void *s1d13745_init(qemu_irq gpio_int) switch (ds_get_bits_per_pixel(s->state)) { case 0: s->line_fn_tab[0] = s->line_fn_tab[1] = - qemu_mallocz(sizeof(blizzard_fn_t) * 0x10); + g_malloc0(sizeof(blizzard_fn_t) * 0x10); break; case 8: s->line_fn_tab[0] = blizzard_draw_fn_8; |