From: Ján Tomko <jtomko@redhat.com>
Date: Thu, 18 Jun 2020 09:58:29 +0000 (+0200)
Subject: Fix allocation of virDomainFSDef
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ea3320048897f5279bc49cb49d26f8099706a834;p=libvirt.git

Fix allocation of virDomainFSDef

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>
---

diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c
index 190c57b622..db3df5ed5a 100644
--- a/src/openvz/openvz_conf.c
+++ b/src/openvz/openvz_conf.c
@@ -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);
diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
index 85935ba731..15f8eb074a 100644
--- a/src/vbox/vbox_common.c
+++ b/src/vbox/vbox_common.c
@@ -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;