xml: Clean up rest of virtual XML document names for XML strings

Commit 498d783 cleans up some of virtual file names for parsing strings
in memory. This patch cleans up (hopefuly) the rest forgotten by the
first patch.

This patch also changes all of the previously modified "filenames" to
valid URI's replacing spaces for underscores.

Changes to v1:
- Replace all spaces for underscores, so that the strings form valid
  URI's
- Replace spaces in places changed by commit 498d783

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 11755febfd75e4f3e98d9d00690581ba085fc463..c4fbdd5535517be524b363fafa1e4b82dea98cc6 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -5739,7 +5739,7 @@ virDomainDeviceDefPtr virDomainDeviceDefParse(virCapsPtr caps,
     xmlXPathContextPtr ctxt = NULL;
     virDomainDeviceDefPtr dev = NULL;
 
-    if (!(xml = virXMLParseStringCtxt(xmlStr, "device.xml", &ctxt))) {
+    if (!(xml = virXMLParseStringCtxt(xmlStr, _("(device_definition)"), &ctxt))) {
         goto error;
     }
     node = ctxt->node;
@@ -7461,7 +7461,7 @@ virDomainDefParse(const char *xmlStr,
     xmlDocPtr xml;
     virDomainDefPtr def = NULL;
 
-    if ((xml = virXMLParse(filename, xmlStr, _("(domain definition)")))) {
+    if ((xml = virXMLParse(filename, xmlStr, _("(domain_definition)")))) {
         def = virDomainDefParseNode(caps, xml, xmlDocGetRootElement(xml),
                                     expectedVirtTypes, flags);
         xmlFreeDoc(xml);
@@ -11573,7 +11573,7 @@ virDomainSnapshotDefParseString(const char *xmlStr,
     int active;
     char *tmp;
 
-    xml = virXMLParseCtxt(NULL, xmlStr, "domainsnapshot.xml", &ctxt);
+    xml = virXMLParseCtxt(NULL, xmlStr, _("(domain_snapshot)"), &ctxt);
     if (!xml) {
         return NULL;
     }

diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c
index 10377e7d5c8cb3d1b35a5b3b50fd5e7dcdc35926..fd8d1ae28f68f2ffe367e15fb36c10082d1158d3 100644 (file)
--- a/src/conf/interface_conf.c
+++ b/src/conf/interface_conf.c
@@ -864,7 +864,7 @@ virInterfaceDefParse(const char *xmlStr,
     xmlDocPtr xml;
     virInterfaceDefPtr def = NULL;
 
-    if ((xml = virXMLParse(filename, xmlStr, "interface.xml"))) {
+    if ((xml = virXMLParse(filename, xmlStr, _("(interface_definition)")))) {
         def = virInterfaceDefParseNode(xml, xmlDocGetRootElement(xml));
         xmlFreeDoc(xml);
     }

diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index e055094c15ddee37d34f983b84e172e3f22ce810..b98ffad0bf37c9e3e63ed6cadb7b60963a75cb75 100644 (file)
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -1084,7 +1084,7 @@ virNetworkDefParse(const char *xmlStr,
     xmlDocPtr xml;
     virNetworkDefPtr def = NULL;
 
-    if ((xml = virXMLParse(filename, xmlStr, "network.xml"))) {
+    if ((xml = virXMLParse(filename, xmlStr, _("(network_definition)")))) {
         def = virNetworkDefParseNode(xml, xmlDocGetRootElement(xml));
         xmlFreeDoc(xml);
     }

diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index 6b0ef50f4c0b1efca7b56d7cd5ffb7eb5861c140..fc284e01e05cbc055ff814348afba3869f946ef6 100644 (file)
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -1231,7 +1231,7 @@ virNodeDeviceDefParse(const char *str,
     xmlDocPtr xml;
     virNodeDeviceDefPtr def = NULL;
 
-    if ((xml = virXMLParse(filename, str, "device.xml"))) {
+    if ((xml = virXMLParse(filename, str, _("(node_device_definition)")))) {
         def = virNodeDeviceDefParseNode(xml, xmlDocGetRootElement(xml), create);
         xmlFreeDoc(xml);
     }

diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c
index 04bfa22ae1125b66a7e6bd24944ba7b07d702d38..08ede48fa9a48050746b4a4533d25699b8ad007e 100644 (file)
--- a/src/conf/nwfilter_conf.c
+++ b/src/conf/nwfilter_conf.c
@@ -2119,7 +2119,7 @@ virNWFilterDefParse(virConnectPtr conn ATTRIBUTE_UNUSED,
     virNWFilterDefPtr def = NULL;
     xmlDocPtr xml;
 
-    if ((xml = virXMLParse(filename, xmlStr, "nwfilter.xml"))) {
+    if ((xml = virXMLParse(filename, xmlStr, _("(nwfilter_definition")))) {
         def = virNWFilterDefParseNode(xml, xmlDocGetRootElement(xml));
         xmlFreeDoc(xml);
     }

diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c
index 105afbe9da6d20ce2dfa8ffd5899bd060d3f719c..b33ce98f70a00beb092aeb2bd4168333647756f5 100644 (file)
--- a/src/conf/secret_conf.c
+++ b/src/conf/secret_conf.c
@@ -195,7 +195,7 @@ virSecretDefParse(const char *xmlStr,
     xmlDocPtr xml;
     virSecretDefPtr ret = NULL;
 
-    if ((xml = virXMLParse(filename, xmlStr, "secret.xml"))) {
+    if ((xml = virXMLParse(filename, xmlStr, _("(definition_of_secret)")))) {
         ret = secretXMLParseNode(xml, xmlDocGetRootElement(xml));
         xmlFreeDoc(xml);
     }

diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index 1e7da69345379737fe8a0fbe6998461d1ffcc003..e893b2d7a0649da6999f20016b0fc83c40b472d8 100644 (file)
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -505,7 +505,7 @@ virStoragePoolDefParseSourceString(const char *srcSpec,
     xmlXPathContextPtr xpath_ctxt = NULL;
     virStoragePoolSourcePtr def = NULL, ret = NULL;
 
-    if (!(doc = virXMLParseStringCtxt(srcSpec, "srcSpec.xml", &xpath_ctxt))) {
+    if (!(doc = virXMLParseStringCtxt(srcSpec, _("(storage_source_specification)"), &xpath_ctxt))) {
         goto cleanup;
     }
 
@@ -765,7 +765,7 @@ virStoragePoolDefParse(const char *xmlStr,
     virStoragePoolDefPtr ret = NULL;
     xmlDocPtr xml;
 
-    if ((xml = virXMLParse(filename, xmlStr, "storage.xml"))) {
+    if ((xml = virXMLParse(filename, xmlStr, _("(storage_pool_definition)")))) {
         ret = virStoragePoolDefParseNode(xml, xmlDocGetRootElement(xml));
         xmlFreeDoc(xml);
     }
@@ -1146,7 +1146,7 @@ virStorageVolDefParse(virStoragePoolDefPtr pool,
     virStorageVolDefPtr ret = NULL;
     xmlDocPtr xml;
 
-    if ((xml = virXMLParse(filename, xmlStr, "storage.xml"))) {
+    if ((xml = virXMLParse(filename, xmlStr, _("(storage_volume_definition)")))) {
         ret = virStorageVolDefParseNode(pool, xml, xmlDocGetRootElement(xml));
         xmlFreeDoc(xml);
     }

diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
index b47f07820e1ee27b452c1a93b87ea287a6548235..2906be9a1471466593bbbe7cb533a12b219bc45b 100644 (file)
--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
@@ -76,7 +76,7 @@ cpuCompareXML(virCPUDefPtr host,
 
     VIR_DEBUG("host=%p, xml=%s", host, NULLSTR(xml));
 
-    if (!(doc = virXMLParseStringCtxt(xml, "cpu.xml", &ctxt)))
+    if (!(doc = virXMLParseStringCtxt(xml, _("(CPU_definition)"), &ctxt)))
         goto cleanup;
 
     cpu = virCPUDefParseXML(ctxt->node, ctxt, VIR_CPU_TYPE_AUTO);
@@ -304,7 +304,7 @@ cpuBaselineXML(const char **xmlCPUs,
         goto no_memory;
 
     for (i = 0; i < ncpus; i++) {
-        if (!(doc = virXMLParseStringCtxt(xmlCPUs[i], "cpu.xml", &ctxt)))
+        if (!(doc = virXMLParseStringCtxt(xmlCPUs[i], _("(CPU_definition)"), &ctxt)))
             goto error;
 
         cpus[i] = virCPUDefParseXML(ctxt->node, ctxt, VIR_CPU_TYPE_HOST);

diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c
index f4033eb8e06763b88f43e9266fdfe6ab98596df8..2d9890cb0248392b2c323ecbbed87b3d651fa5f2 100644 (file)
--- a/src/esx/esx_vi.c
+++ b/src/esx/esx_vi.c
@@ -911,7 +911,7 @@ esxVI_Context_Execute(esxVI_Context *ctx, const char *methodName,
 
     if ((*response)->responseCode == 500 || (*response)->responseCode == 200) {
         (*response)->document = virXMLParseStringCtxt((*response)->content,
-                                                      "esx.xml",
+                                                      _("(esx execute response)"),
                                                       &xpathContext);
 
         if ((*response)->document == NULL) {

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index f849d05319d4bda4dc8b0af12d4cf0953652982e..7fd4192f6e60f45c2f587a53d8f526fba04a1d3a 100644 (file)
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -603,7 +603,7 @@ qemuMigrationCookieXMLParseStr(qemuMigrationCookiePtr mig,
 
     VIR_DEBUG("xml=%s", NULLSTR(xml));
 
-    if (!(doc = virXMLParseStringCtxt(xml, "qemumigration.xml", &ctxt)))
+    if (!(doc = virXMLParseStringCtxt(xml, _("(qemu_migration_cookie)"), &ctxt)))
         goto cleanup;
 
     ret = qemuMigrationCookieXMLParse(mig, ctxt, flags);

diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index b9e551a09f04589fca19ba0255347f080c5f674d..66608f8013b782f3f46a2e8d22f23c7449807cc6 100644 (file)
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -641,7 +641,7 @@ caps_mockup(vahControl * ctl, const char *xmlStr)
     xmlDocPtr xml = NULL;
     xmlXPathContextPtr ctxt = NULL;
 
-    if (!(xml = virXMLParseStringCtxt(xmlStr, _("(domain definition)"),
+    if (!(xml = virXMLParseStringCtxt(xmlStr, _("(domain_definition)"),
                                       &ctxt))) {
         goto cleanup;
     }

diff --git a/tools/virsh.c b/tools/virsh.c
index 430168c02632859eaa09c38dfb26e91d2f95c1c1..3c6e65ad9217ca5968e8a7889b7fa054f26f8709 100644 (file)
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -1307,7 +1307,7 @@ cmdDomIfSetLink (vshControl *ctl, const vshCmd *cmd)
         flags = VIR_DOMAIN_AFFECT_CONFIG;
 
     /* extract current network device description */
-    xml = virXMLParseStringCtxt(desc, _("(domain definition)"), &ctxt);
+    xml = virXMLParseStringCtxt(desc, _("(domain_definition)"), &ctxt);
     VIR_FREE(desc);
     if (!xml) {
         vshError(ctl, _("Failed to parse domain description xml"));
@@ -1454,7 +1454,7 @@ cmdDomIfGetLink (vshControl *ctl, const vshCmd *cmd)
         goto cleanup;
     }
 
-    xml = virXMLParseStringCtxt(desc, _("(domain definition)"), &ctxt);
+    xml = virXMLParseStringCtxt(desc, _("(domain_definition)"), &ctxt);
     VIR_FREE(desc);
     if (!xml) {
         vshError(ctl, _("Failed to parse domain description xml"));
@@ -1663,7 +1663,7 @@ cmdDomblklist(vshControl *ctl, const vshCmd *cmd)
     if (!xml)
         goto cleanup;
 
-    xmldoc = virXMLParseStringCtxt(xml, _("(domain definition)"), &ctxt);
+    xmldoc = virXMLParseStringCtxt(xml, _("(domain_definition)"), &ctxt);
     if (!xmldoc)
         goto cleanup;
 
@@ -9042,7 +9042,7 @@ makeCloneXML(const char *origxml, const char *newname)
     xmlChar *newxml = NULL;
     int size;
 
-    doc = virXMLParseStringCtxt(origxml, _("(volume definition)"), &ctxt);
+    doc = virXMLParseStringCtxt(origxml, _("(volume_definition)"), &ctxt);
     if (!doc)
         goto cleanup;
 
@@ -10833,7 +10833,7 @@ cmdVNCDisplay(vshControl *ctl, const vshCmd *cmd)
     if (!doc)
         goto cleanup;
 
-    xml = virXMLParseStringCtxt(doc, _("(domain definition)"), &ctxt);
+    xml = virXMLParseStringCtxt(doc, _("(domain_definition)"), &ctxt);
     VIR_FREE(doc);
     if (!xml)
         goto cleanup;
@@ -10901,7 +10901,7 @@ cmdTTYConsole(vshControl *ctl, const vshCmd *cmd)
     if (!doc)
         goto cleanup;
 
-    xml = virXMLParseStringCtxt(doc, _("(domain definition)"), &ctxt);
+    xml = virXMLParseStringCtxt(doc, _("(domain_definition)"), &ctxt);
     VIR_FREE(doc);
     if (!xml)
         goto cleanup;
@@ -11288,7 +11288,7 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd)
     if (!doc)
         goto cleanup;
 
-    xml = virXMLParseStringCtxt(doc, _("(domain definition)"), &ctxt);
+    xml = virXMLParseStringCtxt(doc, _("(domain_definition)"), &ctxt);
     VIR_FREE(doc);
     if (!xml) {
         vshError(ctl, "%s", _("Failed to get interface information"));
@@ -11755,7 +11755,7 @@ cmdDetachDisk(vshControl *ctl, const vshCmd *cmd)
     if (!doc)
         goto cleanup;
 
-    xml = virXMLParseStringCtxt(doc, _("(domain definition)"), &ctxt);
+    xml = virXMLParseStringCtxt(doc, _("(domain_definition)"), &ctxt);
     VIR_FREE(doc);
     if (!xml) {
         vshError(ctl, "%s", _("Failed to get disk information"));
@@ -13025,7 +13025,7 @@ cmdSnapshotList(vshControl *ctl, const vshCmd *cmd)
             if (!doc)
                 continue;
 
-            xml = virXMLParseStringCtxt(doc, _("(domain snapshot)"), &ctxt);
+            xml = virXMLParseStringCtxt(doc, _("(domain_snapshot)"), &ctxt);
             if (!xml)
                 continue;
 
@@ -13186,7 +13186,7 @@ cmdSnapshotParent(vshControl *ctl, const vshCmd *cmd)
     if (!xml)
         goto cleanup;
 
-    xmldoc = virXMLParseStringCtxt(xml, _("(domain snapshot)"), &ctxt);
+    xmldoc = virXMLParseStringCtxt(xml, _("(domain_snapshot)"), &ctxt);
     if (!xmldoc)
         goto cleanup;