]> xenbits.xensource.com Git - libvirt.git/commitdiff
Fix allocation of virDomainFSDef
authorJán Tomko <jtomko@redhat.com>
Thu, 18 Jun 2020 09:58:29 +0000 (11:58 +0200)
committerJán Tomko <jtomko@redhat.com>
Thu, 18 Jun 2020 13:56:15 +0000 (15:56 +0200)
Some less commonly used drivers were omitted when we switched
the allocator from a plain VIR_ALLOC to virDomainFSDefNew.

https://bugzilla.redhat.com/show_bug.cgi?id=1846450

Fixes: da665fbd4858890fbb3bbf5da2a7b6ca37bb3220
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
src/openvz/openvz_conf.c
src/vbox/vbox_common.c

index 190c57b622aee694ae3de19589325eb8837c300e..db3df5ed5ab8c92abba14741eecd8dc9491f240d 100644 (file)
@@ -357,7 +357,7 @@ openvzReadFSConf(virDomainDefPtr def,
             goto error;
         }
 
-        if (VIR_ALLOC(fs) < 0)
+        if (!(fs = virDomainFSDefNew(NULL)))
             goto error;
 
         veid_str = g_strdup_printf("%d", veid);
index 85935ba7315345fbfe4188f5f4cbe47afbfc0a75..15f8eb074af9716dc0f47c0f97cbd2d809e2769a 100644 (file)
@@ -3626,7 +3626,7 @@ vboxDumpSharedFolders(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine
         char *hostPath = NULL;
         PRBool writable = PR_FALSE;
 
-        if (VIR_ALLOC(def->fss[i]) < 0)
+        if (!(def->fss[i] = virDomainFSDefNew(data->xmlopt)))
             goto cleanup;
 
         def->fss[i]->type = VIR_DOMAIN_FS_TYPE_MOUNT;