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/xen_disk.c | |
| parent | 14015304b662e8f8ccce46c5a6927af6a14c510b (diff) | |
| download | hqemu-7267c0947d7e8ae5dff7bafd932c3bc285f43e5c.zip hqemu-7267c0947d7e8ae5dff7bafd932c3bc285f43e5c.tar.gz | |
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/xen_disk.c')
| -rw-r--r-- | hw/xen_disk.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/hw/xen_disk.c b/hw/xen_disk.c index add815f..31f9151 100644 --- a/hw/xen_disk.c +++ b/hw/xen_disk.c @@ -124,7 +124,7 @@ static struct ioreq *ioreq_start(struct XenBlkDev *blkdev) goto out; } /* allocate new struct */ - ioreq = qemu_mallocz(sizeof(*ioreq)); + ioreq = g_malloc0(sizeof(*ioreq)); ioreq->blkdev = blkdev; blkdev->requests_total++; qemu_iovec_init(&ioreq->v, BLKIF_MAX_SEGMENTS_PER_REQUEST); @@ -716,15 +716,15 @@ static int blk_init(struct XenDevice *xendev) return 0; out_error: - qemu_free(blkdev->params); + g_free(blkdev->params); blkdev->params = NULL; - qemu_free(blkdev->mode); + g_free(blkdev->mode); blkdev->mode = NULL; - qemu_free(blkdev->type); + g_free(blkdev->type); blkdev->type = NULL; - qemu_free(blkdev->dev); + g_free(blkdev->dev); blkdev->dev = NULL; - qemu_free(blkdev->devtype); + g_free(blkdev->devtype); blkdev->devtype = NULL; return -1; } @@ -822,14 +822,14 @@ static int blk_free(struct XenDevice *xendev) ioreq = QLIST_FIRST(&blkdev->freelist); QLIST_REMOVE(ioreq, list); qemu_iovec_destroy(&ioreq->v); - qemu_free(ioreq); + g_free(ioreq); } - qemu_free(blkdev->params); - qemu_free(blkdev->mode); - qemu_free(blkdev->type); - qemu_free(blkdev->dev); - qemu_free(blkdev->devtype); + g_free(blkdev->params); + g_free(blkdev->mode); + g_free(blkdev->type); + g_free(blkdev->dev); + g_free(blkdev->devtype); qemu_bh_delete(blkdev->bh); return 0; } |
