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/acpi.c | |
parent | 14015304b662e8f8ccce46c5a6927af6a14c510b (diff) | |
download | qemu-7267c0947d7e8ae5dff7bafd932c3bc285f43e5c.zip qemu-7267c0947d7e8ae5dff7bafd932c3bc285f43e5c.tar.gz qemu-7267c0947d7e8ae5dff7bafd932c3bc285f43e5c.tar.bz2 |
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/acpi.c')
-rw-r--r-- | hw/acpi.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -100,13 +100,13 @@ int acpi_table_add(const char *t) if (!acpi_tables) { allen = sizeof(uint16_t); - acpi_tables = qemu_mallocz(allen); + acpi_tables = g_malloc0(allen); } else { allen = acpi_tables_len; } start = allen; - acpi_tables = qemu_realloc(acpi_tables, start + ACPI_TABLE_HDR_SIZE); + acpi_tables = g_realloc(acpi_tables, start + ACPI_TABLE_HDR_SIZE); allen += has_header ? ACPI_TABLE_PFX_SIZE : ACPI_TABLE_HDR_SIZE; /* now read in the data files, reallocating buffer as needed */ @@ -125,7 +125,7 @@ int acpi_table_add(const char *t) if (r == 0) { break; } else if (r > 0) { - acpi_tables = qemu_realloc(acpi_tables, allen + r); + acpi_tables = g_realloc(acpi_tables, allen + r); memcpy(acpi_tables + allen, data, r); allen += r; } else if (errno != EINTR) { @@ -379,8 +379,8 @@ void acpi_pm1_cnt_reset(ACPIPM1CNT *pm1_cnt) void acpi_gpe_init(ACPIGPE *gpe, uint8_t len) { gpe->len = len; - gpe->sts = qemu_mallocz(len / 2); - gpe->en = qemu_mallocz(len / 2); + gpe->sts = g_malloc0(len / 2); + gpe->en = g_malloc0(len / 2); } void acpi_gpe_blk(ACPIGPE *gpe, uint32_t blk) |