提交 a2430cc5 编写于 作者: J Ján Tomko

conf: add xmlopt to virDomainFSDefNew

This will be needed in the future for allocating private data.
Signed-off-by: NJán Tomko <jtomko@redhat.com>
Reviewed-by: NDaniel P. Berrangé <berrange@redhat.com>
上级 adadc342
...@@ -2279,7 +2279,7 @@ virDomainControllerIsPSeriesPHB(const virDomainControllerDef *cont) ...@@ -2279,7 +2279,7 @@ virDomainControllerIsPSeriesPHB(const virDomainControllerDef *cont)
virDomainFSDefPtr virDomainFSDefPtr
virDomainFSDefNew(void) virDomainFSDefNew(virDomainXMLOptionPtr xmlopt G_GNUC_UNUSED)
{ {
virDomainFSDefPtr ret; virDomainFSDefPtr ret;
...@@ -11111,7 +11111,7 @@ virDomainFSDefParseXML(virDomainXMLOptionPtr xmlopt, ...@@ -11111,7 +11111,7 @@ virDomainFSDefParseXML(virDomainXMLOptionPtr xmlopt,
ctxt->node = node; ctxt->node = node;
if (!(def = virDomainFSDefNew())) if (!(def = virDomainFSDefNew(xmlopt)))
return NULL; return NULL;
type = virXMLPropString(node, "type"); type = virXMLPropString(node, "type");
......
...@@ -2866,7 +2866,7 @@ virDomainControllerDefPtr virDomainControllerDefNew(virDomainControllerType type ...@@ -2866,7 +2866,7 @@ virDomainControllerDefPtr virDomainControllerDefNew(virDomainControllerType type
void virDomainControllerDefFree(virDomainControllerDefPtr def); void virDomainControllerDefFree(virDomainControllerDefPtr def);
bool virDomainControllerIsPSeriesPHB(const virDomainControllerDef *cont); bool virDomainControllerIsPSeriesPHB(const virDomainControllerDef *cont);
virDomainFSDefPtr virDomainFSDefNew(void); virDomainFSDefPtr virDomainFSDefNew(virDomainXMLOptionPtr xmlopt);
void virDomainFSDefFree(virDomainFSDefPtr def); void virDomainFSDefFree(virDomainFSDefPtr def);
void virDomainActualNetDefFree(virDomainActualNetDefPtr def); void virDomainActualNetDefFree(virDomainActualNetDefPtr def);
virDomainVsockDefPtr virDomainVsockDefNew(virDomainXMLOptionPtr xmlopt); virDomainVsockDefPtr virDomainVsockDefNew(virDomainXMLOptionPtr xmlopt);
......
...@@ -59,7 +59,7 @@ lxcCreateFSDef(int type, ...@@ -59,7 +59,7 @@ lxcCreateFSDef(int type,
{ {
virDomainFSDefPtr def; virDomainFSDefPtr def;
if (!(def = virDomainFSDefNew())) if (!(def = virDomainFSDefNew(NULL)))
return NULL; return NULL;
def->type = type; def->type = type;
......
...@@ -1138,7 +1138,7 @@ virLXCProcessEnsureRootFS(virDomainObjPtr vm) ...@@ -1138,7 +1138,7 @@ virLXCProcessEnsureRootFS(virDomainObjPtr vm)
if (root) if (root)
return 0; return 0;
if (!(root = virDomainFSDefNew())) if (!(root = virDomainFSDefNew(NULL)))
goto error; goto error;
root->type = VIR_DOMAIN_FS_TYPE_MOUNT; root->type = VIR_DOMAIN_FS_TYPE_MOUNT;
......
...@@ -340,7 +340,7 @@ openvzReadFSConf(virDomainDefPtr def, ...@@ -340,7 +340,7 @@ openvzReadFSConf(virDomainDefPtr def,
veid); veid);
goto error; goto error;
} else if (ret > 0) { } else if (ret > 0) {
if (!(fs = virDomainFSDefNew())) if (!(fs = virDomainFSDefNew(NULL)))
goto error; goto error;
fs->type = VIR_DOMAIN_FS_TYPE_TEMPLATE; fs->type = VIR_DOMAIN_FS_TYPE_TEMPLATE;
......
...@@ -2465,7 +2465,7 @@ int virVMXParseFileSystem(virConfPtr conf, int number, virDomainFSDefPtr *def) ...@@ -2465,7 +2465,7 @@ int virVMXParseFileSystem(virConfPtr conf, int number, virDomainFSDefPtr *def)
if (!(present && enabled)) if (!(present && enabled))
return 0; return 0;
if (!(*def = virDomainFSDefNew())) if (!(*def = virDomainFSDefNew(NULL)))
return -1; return -1;
(*def)->type = VIR_DOMAIN_FS_TYPE_MOUNT; (*def)->type = VIR_DOMAIN_FS_TYPE_MOUNT;
......
...@@ -825,7 +825,7 @@ prlsdkAddDomainHardDisksInfo(vzDriverPtr driver, PRL_HANDLE sdkdom, virDomainDef ...@@ -825,7 +825,7 @@ prlsdkAddDomainHardDisksInfo(vzDriverPtr driver, PRL_HANDLE sdkdom, virDomainDef
if (IS_CT(def) && if (IS_CT(def) &&
prlsdkInBootList(sdkdom, hdd)) { prlsdkInBootList(sdkdom, hdd)) {
if (!(fs = virDomainFSDefNew())) if (!(fs = virDomainFSDefNew(NULL)))
goto error; goto error;
if (prlsdkGetFSInfo(hdd, fs) < 0) if (prlsdkGetFSInfo(hdd, fs) < 0)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册