From: Jonathon Jongsma <jjongsma@redhat.com>
Date: Fri, 10 Jan 2020 23:32:15 +0000 (-0600)
Subject: qemu: use glib alloc in qemuAgentGetFSInfoFillDisks()
X-Git-Tag: v6.1.0-rc1~496
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e1a8298cda919e778ecab3a66289f2c97bb5378;p=thirdparty%2Flibvirt.git

qemu: use glib alloc in qemuAgentGetFSInfoFillDisks()

Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
index 47bfef7141..7186b1da64 100644
--- a/src/qemu/qemu_agent.c
+++ b/src/qemu/qemu_agent.c
@@ -1894,10 +1894,8 @@ qemuAgentGetFSInfoFillDisks(virJSONValuePtr jsondisks,
 
     ndisks = virJSONValueArraySize(jsondisks);
 
-    if (ndisks &&
-        VIR_ALLOC_N(fsinfo->disks, ndisks) < 0)
-        return -1;
-
+    if (ndisks)
+        fsinfo->disks = g_new0(qemuAgentDiskInfoPtr, ndisks);
     fsinfo->ndisks = ndisks;
 
     for (i = 0; i < fsinfo->ndisks; i++) {
@@ -1914,8 +1912,7 @@ qemuAgentGetFSInfoFillDisks(virJSONValuePtr jsondisks,
             return -1;
         }
 
-        if (VIR_ALLOC(fsinfo->disks[i]) < 0)
-            return -1;
+        fsinfo->disks[i] = g_new0(qemuAgentDiskInfo, 1);
         disk = fsinfo->disks[i];
 
         if ((val = virJSONValueObjectGetString(jsondisk, "bus-type")))