From d6bd288da289f8f863d3667dbcb34066da14e713 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Thu, 8 Jan 2009 19:52:15 +0000 Subject: [PATCH] add missing flags argument --- ChangeLog | 10 ++++++++++ src/xend_internal.c | 4 ++-- src/xm_internal.c | 7 ++++--- tests/xmconfigtest.c | 3 ++- tests/xml2sexprtest.c | 3 ++- 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index b3ccec699e..f6c2653cf0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Thu Jan 8 20:47:26 CET 2009 Guido Günther + + add missing flags argument + * src/xend_internal.c (xenDaemonAttachDevice, xenDaemonDetachDevice): + Add missing flags argument + * src/xm_internal.c (xenXMDomainDefineXML, xenXMDomainAttachDevice, + xenXMDomainDetachDevice): Likewise + * tests/xmconfigtest.c (testCompareParseXML): Likewise + * tests/xml2sexprtest.c (testCompareFiles): Likewise + Thu Jan 8 14:41:55 CET 2009 Guido Günther pass flags argument to all virDomain*DefParse* functions diff --git a/src/xend_internal.c b/src/xend_internal.c index 2b15592b99..c3ffd6396b 100644 --- a/src/xend_internal.c +++ b/src/xend_internal.c @@ -3857,7 +3857,7 @@ xenDaemonAttachDevice(virDomainPtr domain, const char *xml) if (!(dev = virDomainDeviceDefParse(domain->conn, priv->caps, - def, xml))) + def, xml, VIR_DOMAIN_XML_INACTIVE))) goto cleanup; @@ -3947,7 +3947,7 @@ xenDaemonDetachDevice(virDomainPtr domain, const char *xml) if (!(dev = virDomainDeviceDefParse(domain->conn, priv->caps, - def, xml))) + def, xml, VIR_DOMAIN_XML_INACTIVE))) goto cleanup; if (virDomainXMLDevID(domain, dev, class, ref, sizeof(ref))) diff --git a/src/xm_internal.c b/src/xm_internal.c index b6d5c010a4..bfa3ff298a 100644 --- a/src/xm_internal.c +++ b/src/xm_internal.c @@ -2285,7 +2285,8 @@ virDomainPtr xenXMDomainDefineXML(virConnectPtr conn, const char *xml) { return (NULL); #endif - if (!(def = virDomainDefParseString(conn, priv->caps, xml))) + if (!(def = virDomainDefParseString(conn, priv->caps, xml, + VIR_DOMAIN_XML_INACTIVE))) return (NULL); if (virHashLookup(nameConfigMap, def->name)) { @@ -2527,7 +2528,7 @@ xenXMDomainAttachDevice(virDomainPtr domain, const char *xml) { if (!(dev = virDomainDeviceDefParse(domain->conn, priv->caps, entry->def, - xml))) + xml, VIR_DOMAIN_XML_INACTIVE))) return -1; switch (dev->type) { @@ -2616,7 +2617,7 @@ xenXMDomainDetachDevice(virDomainPtr domain, const char *xml) { if (!(dev = virDomainDeviceDefParse(domain->conn, priv->caps, entry->def, - xml))) + xml, VIR_DOMAIN_XML_INACTIVE))) return -1; switch (dev->type) { diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c index 7ac5afb4ec..bb2803f668 100644 --- a/tests/xmconfigtest.c +++ b/tests/xmconfigtest.c @@ -70,7 +70,8 @@ static int testCompareParseXML(const char *xmcfg, const char *xml, priv.caps = caps; conn->privateData = &priv; - if (!(def = virDomainDefParseString(NULL, caps, xmlPtr))) + if (!(def = virDomainDefParseString(NULL, caps, xmlPtr, + VIR_DOMAIN_XML_INACTIVE))) goto fail; if (!(conf = xenXMDomainConfigFormat(conn, def))) diff --git a/tests/xml2sexprtest.c b/tests/xml2sexprtest.c index b05e6c8d66..b06c3ace81 100644 --- a/tests/xml2sexprtest.c +++ b/tests/xml2sexprtest.c @@ -35,7 +35,8 @@ static int testCompareFiles(const char *xml, const char *sexpr, if (virtTestLoadFile(sexpr, &sexprPtr, MAX_FILE) < 0) goto fail; - if (!(def = virDomainDefParseString(NULL, caps, xmlData))) + if (!(def = virDomainDefParseString(NULL, caps, xmlData, + VIR_DOMAIN_XML_INACTIVE))) goto fail; if (!(gotsexpr = xenDaemonFormatSxpr(NULL, def, xendConfigVersion)))