openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make virDomainObjParseNode() static 

Make virDomainObjParseNode() static since it is called only
in one file.
This commit is contained in:
Hu Tao 2011-03-16 15:03:47 +08:00 committed by Eric Blake
parent 78ba748ef1
commit d69171566d
2 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/conf/domain_conf.c
View File

@ -6081,24 +6081,10 @@ cleanup:
}
virDomainObjPtr virDomainObjParseFile(virCapsPtr caps,
const char *filename)
{
xmlDocPtr xml;
virDomainObjPtr obj = NULL;
if ((xml = virXMLParseFile(filename))) {
obj = virDomainObjParseNode(caps, xml, xmlDocGetRootElement(xml));
xmlFreeDoc(xml);
}
return obj;
}
virDomainObjPtr virDomainObjParseNode(virCapsPtr caps,
xmlDocPtr xml,
xmlNodePtr root)
static virDomainObjPtr
virDomainObjParseNode(virCapsPtr caps,
xmlDocPtr xml,
xmlNodePtr root)
{
xmlXPathContextPtr ctxt = NULL;
virDomainObjPtr obj = NULL;
@ -6123,6 +6109,22 @@ cleanup:
return obj;
}
virDomainObjPtr virDomainObjParseFile(virCapsPtr caps,
const char *filename)
{
xmlDocPtr xml;
virDomainObjPtr obj = NULL;
if ((xml = virXMLParseFile(filename))) {
obj = virDomainObjParseNode(caps, xml, xmlDocGetRootElement(xml));
xmlFreeDoc(xml);
}
return obj;
}
static int virDomainDefMaybeAddController(virDomainDefPtr def,
int type,
int idx)

3
src/conf/domain_conf.h
View File

@ -1246,9 +1246,6 @@ virDomainDefPtr virDomainDefParseNode(virCapsPtr caps,
virDomainObjPtr virDomainObjParseFile(virCapsPtr caps,
const char *filename);
virDomainObjPtr virDomainObjParseNode(virCapsPtr caps,
xmlDocPtr xml,
xmlNodePtr root);
int virDomainDefAddImplicitControllers(virDomainDefPtr def);