[libvirt] [PATCH 3/9] conf: add xmlopt to virDomainFSDefNew
This will be needed in the future for allocating private data.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/conf/domain_conf.c | 4 ++--
src/conf/domain_conf.h | 2 +-
src/lxc/lxc_native.c | 2 +-
src/lxc/lxc_process.c | 2 +-
src/openvz/openvz_conf.c | 2 +-
src/vmx/vmx.c | 2 +-
src/vz/vz_sdk.c | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index ee33b7caf0..400467f9c0 100644
--- 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;
@@ -11127,7 +11127,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 e012975fca..8f97b53b69 100644
--- 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 e9b83653b5..dd2345c324 100644
--- 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 487a085b7e..0a9ccdf9ec 100644
--- 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 c4c6dec2f7..32696c675e 100644
--- 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 2afb0b2823..aa88dfcb5d 100644
--- 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 c98542c244..f13f8a81b3 100644
--- 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)
--
2.21.0