conf: add xmlopt to virDomainFSDefNew

This will be needed in the future for allocating private data.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 6b05d06481f1e23831b7cf3a8722d70c33df95c6..731ed067b726a96087b8e7bd07d090862b784bf6 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2279,7 +2279,7 @@ virDomainControllerIsPSeriesPHB(const virDomainControllerDef *cont)
 
 
 virDomainFSDefPtr
-virDomainFSDefNew(void)
+virDomainFSDefNew(virDomainXMLOptionPtr xmlopt G_GNUC_UNUSED)
 {
     virDomainFSDefPtr ret;
 
@@ -11111,7 +11111,7 @@ virDomainFSDefParseXML(virDomainXMLOptionPtr xmlopt,
 
     ctxt->node = node;
 
-    if (!(def = virDomainFSDefNew()))
+    if (!(def = virDomainFSDefNew(xmlopt)))
         return NULL;
 
     type = virXMLPropString(node, "type");

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index e6b06a8eba1c48c07aa9e09b024bc1ab1d2df540..16653e8aac18e1a3e92beea83bdd184a0436b35d 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2866,7 +2866,7 @@ virDomainControllerDefPtr virDomainControllerDefNew(virDomainControllerType type
 void virDomainControllerDefFree(virDomainControllerDefPtr def);
 bool virDomainControllerIsPSeriesPHB(const virDomainControllerDef *cont);
 
-virDomainFSDefPtr virDomainFSDefNew(void);
+virDomainFSDefPtr virDomainFSDefNew(virDomainXMLOptionPtr xmlopt);
 void virDomainFSDefFree(virDomainFSDefPtr def);
 void virDomainActualNetDefFree(virDomainActualNetDefPtr def);
 virDomainVsockDefPtr virDomainVsockDefNew(virDomainXMLOptionPtr xmlopt);

diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c
index e9b83653b535ba66fdacdea2b93fda470429af95..dd2345c324caa040d4b19ab15de81bae27ebec1e 100644 (file)
--- a/src/lxc/lxc_native.c
+++ b/src/lxc/lxc_native.c
@@ -59,7 +59,7 @@ lxcCreateFSDef(int type,
 {
     virDomainFSDefPtr def;
 
-    if (!(def = virDomainFSDefNew()))
+    if (!(def = virDomainFSDefNew(NULL)))
         return NULL;
 
     def->type = type;

diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
index 487a085b7ea0587ad20ceb8492c0656e6c05630a..0a9ccdf9ec2d785e5ee997eca9c8ae8d299b5418 100644 (file)
--- a/src/lxc/lxc_process.c
+++ b/src/lxc/lxc_process.c
@@ -1138,7 +1138,7 @@ virLXCProcessEnsureRootFS(virDomainObjPtr vm)
     if (root)
         return 0;
 
-    if (!(root = virDomainFSDefNew()))
+    if (!(root = virDomainFSDefNew(NULL)))
         goto error;
 
     root->type = VIR_DOMAIN_FS_TYPE_MOUNT;

diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c
index 40a748351d24140bd8a4aab7dd4c0209bafec245..e9ee1a7bf431932946996903127cf1586c150095 100644 (file)
--- a/src/openvz/openvz_conf.c
+++ b/src/openvz/openvz_conf.c
@@ -340,7 +340,7 @@ openvzReadFSConf(virDomainDefPtr def,
                        veid);
         goto error;
     } else if (ret > 0) {
-        if (!(fs = virDomainFSDefNew()))
+        if (!(fs = virDomainFSDefNew(NULL)))
             goto error;
 
         fs->type = VIR_DOMAIN_FS_TYPE_TEMPLATE;

diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index 2afb0b28233114fe9cdba95c24a355e906f00175..aa88dfcb5d3622666f8262fabac49617a1fa0e0e 100644 (file)
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -2465,7 +2465,7 @@ int virVMXParseFileSystem(virConfPtr conf, int number, virDomainFSDefPtr *def)
     if (!(present && enabled))
         return 0;
 
-    if (!(*def = virDomainFSDefNew()))
+    if (!(*def = virDomainFSDefNew(NULL)))
         return -1;
 
     (*def)->type = VIR_DOMAIN_FS_TYPE_MOUNT;

diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
index 71ca1a9148c25436d01c7e2f8b3791b576396d64..473719dcfecfc76bf7cb0c63549e2d4433e1297b 100644 (file)
--- a/src/vz/vz_sdk.c
+++ b/src/vz/vz_sdk.c
@@ -825,7 +825,7 @@ prlsdkAddDomainHardDisksInfo(vzDriverPtr driver, PRL_HANDLE sdkdom, virDomainDef
         if (IS_CT(def) &&
             prlsdkInBootList(sdkdom, hdd)) {
 
-            if (!(fs = virDomainFSDefNew()))
+            if (!(fs = virDomainFSDefNew(NULL)))
                 goto error;
 
             if (prlsdkGetFSInfo(hdd, fs) < 0)