summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlaf Hering2017-07-28 15:11:51 +0200
committerStefano Stabellini2017-09-21 04:05:26 +0200
commita3fd781f653db4dc76635715207c9029208634bd (patch)
tree69fa22bfa8b70787617bf0af7d9021f7a926ab7b
parentMerge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging (diff)
downloadqemu-a3fd781f653db4dc76635715207c9029208634bd.tar.gz
qemu-a3fd781f653db4dc76635715207c9029208634bd.tar.xz
qemu-a3fd781f653db4dc76635715207c9029208634bd.zip
xen-disk: use g_new0 to fix build
g_malloc0_n is available since glib-2.24. To allow build with older glib versions use the generic g_new0, which is already used in many other places in the code. Fixes commit 3284fad728 ("xen-disk: add support for multi-page shared rings") Signed-off-by: Olaf Hering <olaf@aepfle.de> Reviewed-by: Stefano Stabellini <sstabellini@kernel.org> Signed-off-by: Stefano Stabellini <sstabellini@kernel.org>
-rw-r--r--hw/block/xen_disk.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/block/xen_disk.c b/hw/block/xen_disk.c
index d42ed7070d..536e2ee735 100644
--- a/hw/block/xen_disk.c
+++ b/hw/block/xen_disk.c
@@ -1232,7 +1232,7 @@ static int blk_connect(struct XenDevice *xendev)
return -1;
}
- domids = g_malloc0_n(blkdev->nr_ring_ref, sizeof(uint32_t));
+ domids = g_new0(uint32_t, blkdev->nr_ring_ref);
for (i = 0; i < blkdev->nr_ring_ref; i++) {
domids[i] = blkdev->xendev.dom;
}