]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: use glib alloc in qemuAgentGetFSInfoFillDisks()
authorJonathon Jongsma <jjongsma@redhat.com>
Fri, 10 Jan 2020 23:32:15 +0000 (17:32 -0600)
committerMichal Privoznik <mprivozn@redhat.com>
Thu, 16 Jan 2020 15:35:47 +0000 (16:35 +0100)
Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
src/qemu/qemu_agent.c

index 47bfef71414a4cf8f10e94b112d0339e1b5db474..7186b1da6434a25a680b363733553dead5311998 100644 (file)
@@ -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")))