File qemu.a3fd781f653db4dc76635715207c9029208634bd.p... of Package qemu-2.10

Overview Repositories Revisions Requests Users Attributes Meta

File qemu.a3fd781f653db4dc76635715207c9029208634bd.patch of Package qemu-2.10

From: Olaf Hering <olaf@aepfle.de>
Date: Fri, 28 Jul 2017 15:11:51 +0200
Subject: a3fd781f653db4dc76635715207c9029208634bd

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>
---
 hw/block/xen_disk.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/hw/block/xen_disk.c
+++ b/hw/block/xen_disk.c
@@ -1223,25 +1223,25 @@ static int blk_connect(struct XenDevice *xendev)
     /* Calculate the maximum number of grants needed by ioreqs */
     max_grants = MAX_GRANTS(blkdev->max_requests,
                             BLKIF_MAX_SEGMENTS_PER_REQUEST);
     /* Add on the number needed for the ring pages */
     max_grants += blkdev->nr_ring_ref;
 
     if (xengnttab_set_max_grants(blkdev->xendev.gnttabdev, max_grants)) {
         xen_pv_printf(xendev, 0, "xengnttab_set_max_grants failed: %s\n",
                       strerror(errno));
         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;
     }
 
     blkdev->sring = xengnttab_map_grant_refs(blkdev->xendev.gnttabdev,
                                              blkdev->nr_ring_ref,
                                              domids,
                                              blkdev->ring_ref,
                                              PROT_READ | PROT_WRITE);
 
     g_free(domids);

Places

File qemu.a3fd781f653db4dc76635715207c9029208634bd.patch of Package qemu-2.10

Places