External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

conf: fix domain parse flags

Browse Source 
* Change all flags args from int to unsigned int

* Allow passing flags in virDomainObjParseFile (and propogate those
  flags all the way down the call chain). Previously the flags were
  hardcoded (to VIR_DOMAIN_XML_INTERNAL_STATUS) several layers down
  the chain. Pass that value in at the one place that is currently
  calling virDomainObjParseFile.
This commit is contained in:
Laine Stump 2011-07-04 15:06:07 -04:00
parent 3ab1776b7f
commit d3f7c7b151
2 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/conf/domain_conf.c
View File

@ -5160,7 +5160,7 @@ error:
virDomainDeviceDefPtr virDomainDeviceDefParse(virCapsPtr caps, virDomainDeviceDefPtr virDomainDeviceDefParse(virCapsPtr caps,
const virDomainDefPtr def, const virDomainDefPtr def,
const char *xmlStr, const char *xmlStr,
int flags) unsigned int flags)
{ {
xmlDocPtr xml; xmlDocPtr xml;
xmlNodePtr node; xmlNodePtr node;
@ -6703,7 +6703,8 @@ no_memory:
static virDomainObjPtr virDomainObjParseXML(virCapsPtr caps, static virDomainObjPtr virDomainObjParseXML(virCapsPtr caps,
xmlDocPtr xml, xmlDocPtr xml,
xmlXPathContextPtr ctxt) xmlXPathContextPtr ctxt,
unsigned int flags)
{ {
char *tmp = NULL; char *tmp = NULL;
long val; long val;
@ -6726,8 +6727,7 @@ static virDomainObjPtr virDomainObjParseXML(virCapsPtr caps,
oldnode = ctxt->node; oldnode = ctxt->node;
ctxt->node = config; ctxt->node = config;
obj->def = virDomainDefParseXML(caps, xml, config, ctxt, obj->def = virDomainDefParseXML(caps, xml, config, ctxt, flags);
VIR_DOMAIN_XML_INTERNAL_STATUS);
ctxt->node = oldnode; ctxt->node = oldnode;
if (!obj->def) if (!obj->def)
goto error; goto error;
@ -6816,14 +6816,14 @@ virDomainDefParse(const char *xmlStr,
virDomainDefPtr virDomainDefParseString(virCapsPtr caps, virDomainDefPtr virDomainDefParseString(virCapsPtr caps,
const char *xmlStr, const char *xmlStr,
int flags) unsigned int flags)
{ {
return virDomainDefParse(xmlStr, NULL, caps, flags); return virDomainDefParse(xmlStr, NULL, caps, flags);
} }
virDomainDefPtr virDomainDefParseFile(virCapsPtr caps, virDomainDefPtr virDomainDefParseFile(virCapsPtr caps,
const char *filename, const char *filename,
int flags) unsigned int flags)
{ {
return virDomainDefParse(NULL, filename, caps, flags); return virDomainDefParse(NULL, filename, caps, flags);
} }
@ -6832,7 +6832,7 @@ virDomainDefPtr virDomainDefParseFile(virCapsPtr caps,
virDomainDefPtr virDomainDefParseNode(virCapsPtr caps, virDomainDefPtr virDomainDefParseNode(virCapsPtr caps,
xmlDocPtr xml, xmlDocPtr xml,
xmlNodePtr root, xmlNodePtr root,
int flags) unsigned int flags)
{ {
xmlXPathContextPtr ctxt = NULL; xmlXPathContextPtr ctxt = NULL;
virDomainDefPtr def = NULL; virDomainDefPtr def = NULL;
@ -6861,7 +6861,8 @@ cleanup:
static virDomainObjPtr static virDomainObjPtr
virDomainObjParseNode(virCapsPtr caps, virDomainObjParseNode(virCapsPtr caps,
xmlDocPtr xml, xmlDocPtr xml,
xmlNodePtr root) xmlNodePtr root,
unsigned int flags)
{ {
xmlXPathContextPtr ctxt = NULL; xmlXPathContextPtr ctxt = NULL;
virDomainObjPtr obj = NULL; virDomainObjPtr obj = NULL;
@ -6879,7 +6880,7 @@ virDomainObjParseNode(virCapsPtr caps,
} }
ctxt->node = root; ctxt->node = root;
obj = virDomainObjParseXML(caps, xml, ctxt); obj = virDomainObjParseXML(caps, xml, ctxt, flags);
cleanup: cleanup:
xmlXPathFreeContext(ctxt); xmlXPathFreeContext(ctxt);
@ -6888,13 +6889,15 @@ cleanup:
virDomainObjPtr virDomainObjParseFile(virCapsPtr caps, virDomainObjPtr virDomainObjParseFile(virCapsPtr caps,
const char *filename) const char *filename,
unsigned int flags)
{ {
xmlDocPtr xml; xmlDocPtr xml;
virDomainObjPtr obj = NULL; virDomainObjPtr obj = NULL;
if ((xml = virXMLParseFile(filename))) { if ((xml = virXMLParseFile(filename))) {
obj = virDomainObjParseNode(caps, xml, xmlDocGetRootElement(xml)); obj = virDomainObjParseNode(caps, xml,
xmlDocGetRootElement(xml), flags);
xmlFreeDoc(xml); xmlFreeDoc(xml);
} }
@ -9500,7 +9503,7 @@ virDomainHostdevDefFormat(virBufferPtr buf,
char *virDomainDefFormat(virDomainDefPtr def, char *virDomainDefFormat(virDomainDefPtr def,
int flags) unsigned int flags)
{ {
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
unsigned char *uuid; unsigned char *uuid;
@ -10138,7 +10141,8 @@ static virDomainObjPtr virDomainLoadStatus(virCapsPtr caps,
if ((statusFile = virDomainConfigFile(statusDir, name)) == NULL) if ((statusFile = virDomainConfigFile(statusDir, name)) == NULL)
goto error; goto error;
if (!(obj = virDomainObjParseFile(caps, statusFile))) if (!(obj = virDomainObjParseFile(caps, statusFile,
VIR_DOMAIN_XML_INTERNAL_STATUS)))
goto error; goto error;
virUUIDFormat(obj->def->uuid, uuidstr); virUUIDFormat(obj->def->uuid, uuidstr);

13
src/conf/domain_conf.h
View File

@ -1378,20 +1378,21 @@ void virDomainRemoveInactive(virDomainObjListPtr doms,
virDomainDeviceDefPtr virDomainDeviceDefParse(virCapsPtr caps, virDomainDeviceDefPtr virDomainDeviceDefParse(virCapsPtr caps,
const virDomainDefPtr def, const virDomainDefPtr def,
const char *xmlStr, const char *xmlStr,
int flags); unsigned int flags);
virDomainDefPtr virDomainDefParseString(virCapsPtr caps, virDomainDefPtr virDomainDefParseString(virCapsPtr caps,
const char *xmlStr, const char *xmlStr,
int flags); unsigned int flags);
virDomainDefPtr virDomainDefParseFile(virCapsPtr caps, virDomainDefPtr virDomainDefParseFile(virCapsPtr caps,
const char *filename, const char *filename,
int flags); unsigned int flags);
virDomainDefPtr virDomainDefParseNode(virCapsPtr caps, virDomainDefPtr virDomainDefParseNode(virCapsPtr caps,
xmlDocPtr doc, xmlDocPtr doc,
xmlNodePtr root, xmlNodePtr root,
int flags); unsigned int flags);
virDomainObjPtr virDomainObjParseFile(virCapsPtr caps, virDomainObjPtr virDomainObjParseFile(virCapsPtr caps,
const char *filename); const char *filename,
unsigned int flags);
bool virDomainDefCheckABIStability(virDomainDefPtr src, bool virDomainDefCheckABIStability(virDomainDefPtr src,
virDomainDefPtr dst); virDomainDefPtr dst);
@ -1399,7 +1400,7 @@ bool virDomainDefCheckABIStability(virDomainDefPtr src,
int virDomainDefAddImplicitControllers(virDomainDefPtr def); int virDomainDefAddImplicitControllers(virDomainDefPtr def);
char *virDomainDefFormat(virDomainDefPtr def, char *virDomainDefFormat(virDomainDefPtr def,
int flags); unsigned int flags);
int virDomainCpuSetParse(const char **str, int virDomainCpuSetParse(const char **str,
char sep, char sep,