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 | 52e431959c8a063b4d79db47e9bdcc5a8f1d21f1 (patch) | |
| tree | 9aa05d6e05ed83e67bf014f6745a3081b8407dc5 /hw/pflash_cfi02.c | |
| parent | 2be0e4ec99e6f88c4c48a14bdb5dd1f6413e4073 (diff) | |
| download | qemu-52e431959c8a063b4d79db47e9bdcc5a8f1d21f1.tar.gz qemu-52e431959c8a063b4d79db47e9bdcc5a8f1d21f1.tar.bz2 qemu-52e431959c8a063b4d79db47e9bdcc5a8f1d21f1.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/pflash_cfi02.c')
| -rw-r--r-- | hw/pflash_cfi02.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/pflash_cfi02.c b/hw/pflash_cfi02.c index 725cd1e78c..ac5115e4c8 100644 --- a/hw/pflash_cfi02.c +++ b/hw/pflash_cfi02.c @@ -617,7 +617,7 @@ pflash_t *pflash_cfi02_register(target_phys_addr_t base, ram_addr_t off, total_len != (32 * 1024 * 1024) && total_len != (64 * 1024 * 1024)) return NULL; #endif - pfl = qemu_mallocz(sizeof(pflash_t)); + pfl = g_malloc0(sizeof(pflash_t)); /* FIXME: Allocate ram ourselves. */ pfl->storage = qemu_get_ram_ptr(off); if (be) { @@ -640,7 +640,7 @@ pflash_t *pflash_cfi02_register(target_phys_addr_t base, ram_addr_t off, ret = bdrv_read(pfl->bs, 0, pfl->storage, chip_len >> 9); if (ret < 0) { cpu_unregister_io_memory(pfl->fl_mem); - qemu_free(pfl); + g_free(pfl); return NULL; } } |