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/mips_malta.c | |
| parent | 14015304b662e8f8ccce46c5a6927af6a14c510b (diff) | |
| download | 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/mips_malta.c')
| -rw-r--r-- | hw/mips_malta.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/mips_malta.c b/hw/mips_malta.c index ed2a483c9b..5bdb45b747 100644 --- a/hw/mips_malta.c +++ b/hw/mips_malta.c @@ -433,7 +433,7 @@ static MaltaFPGAState *malta_fpga_init(target_phys_addr_t base, qemu_irq uart_ir MaltaFPGAState *s; int malta; - s = (MaltaFPGAState *)qemu_mallocz(sizeof(MaltaFPGAState)); + s = (MaltaFPGAState *)g_malloc0(sizeof(MaltaFPGAState)); malta = cpu_register_io_memory(malta_fpga_read, malta_fpga_write, s, @@ -709,7 +709,7 @@ static int64_t load_kernel (void) /* Setup prom parameters. */ prom_size = ENVP_NB_ENTRIES * (sizeof(int32_t) + ENVP_ENTRY_SIZE); - prom_buf = qemu_malloc(prom_size); + prom_buf = g_malloc(prom_size); prom_set(prom_buf, prom_index++, "%s", loaderparams.kernel_filename); if (initrd_size > 0) { @@ -863,7 +863,7 @@ void mips_malta_init (ram_addr_t ram_size, if (filename) { bios_size = load_image_targphys(filename, 0x1fc00000LL, BIOS_SIZE); - qemu_free(filename); + g_free(filename); } else { bios_size = -1; } |