7:32 a.m.
Pavel Hrdina (8):
util: introduce virXMLNodeNameEqual
use virXMLNodeNameEqual instead of xmlStrEqual
conf: cleanup virDomainChrSourceDef parsing
conf: use virXMLPropString for KeyWrapCipherDef parsing
conf: use virXMLPropString for disk geometry parsing
conf: use virXMLPropString for IOThread parsing
conf: use virXMLPropString for IOThread pin parsing
conf: use virXMLPropString for Domain def parsing
src/conf/cpu_conf.c | 2 +-
src/conf/domain_conf.c | 373 ++++++++++++++++-------------------
src/conf/interface_conf.c | 2 +-
src/conf/netdev_bandwidth_conf.c | 6 +-
src/conf/netdev_vport_profile_conf.c | 2 +-
src/conf/network_conf.c | 12 +-
src/conf/node_device_conf.c | 2 +-
src/conf/nwfilter_conf.c | 6 +-
src/conf/nwfilter_params.c | 2 +-
src/conf/secret_conf.c | 2 +-
src/conf/snapshot_conf.c | 2 +-
src/conf/storage_conf.c | 4 +-
src/conf/virnetworkobj.c | 2 +-
src/conf/virsavecookie.c | 2 +-
src/esx/esx_vi_types.c | 9 +-
src/libvirt_private.syms | 1 +
src/security/virt-aa-helper.c | 2 +-
src/test/test_driver.c | 2 +-
src/util/virxml.c | 16 ++
src/util/virxml.h | 3 +
src/vz/vz_sdk.c | 2 +-
tools/virsh-domain.c | 18 +-
tools/virsh-interface.c | 12 +-
23 files changed, 236 insertions(+), 248 deletions(-)
--
2.13.5
7:32 a.m.
New subject: [libvirt] [PATCH 1/8] util: introduce virXMLNodeNameEqual
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
src/libvirt_private.syms | 1 +
src/util/virxml.c | 16 ++++++++++++++++
src/util/virxml.h | 3 +++
3 files changed, 20 insertions(+)
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 447dd938d0..4f1ad2a0cc 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2931,6 +2931,7 @@ virVHBAPathExists;
virXMLCheckIllegalChars;
virXMLChildElementCount;
virXMLExtractNamespaceXML;
+virXMLNodeNameEqual;
virXMLNodeSanitizeNamespaces;
virXMLNodeToString;
virXMLParseHelper;
diff --git a/src/util/virxml.c b/src/util/virxml.c
index 39049d869b..b42358a08c 100644
--- a/src/util/virxml.c
+++ b/src/util/virxml.c
@@ -950,6 +950,22 @@ virXMLNodeToString(xmlDocPtr doc,
return ret;
}
+
+/**
+ * virXMLNodeNameEqual:
+ * @node: xml Node pointer to check
+ * @name: name of the @node
+ *
+ * Compares the @node name with @name.
+ */
+bool
+virXMLNodeNameEqual(xmlNodePtr node,
+ const char *name)
+{
+ return xmlStrEqual(node->name, BAD_CAST name);
+}
+
+
typedef int (*virXMLForeachCallback)(xmlNodePtr node,
void *opaque);
diff --git a/src/util/virxml.h b/src/util/virxml.h
index 17fccd81f4..2f953a6d44 100644
--- a/src/util/virxml.h
+++ b/src/util/virxml.h
@@ -168,6 +168,9 @@ int virXMLSaveFile(const char *path,
char *virXMLNodeToString(xmlDocPtr doc, xmlNodePtr node);
+bool virXMLNodeNameEqual(xmlNodePtr node,
+ const char *name);
+
xmlNodePtr virXMLFindChildNodeByNs(xmlNodePtr root,
const char *uri);
--
2.13.5
7:32 a.m.
New subject: [libvirt] [PATCH 2/8] use virXMLNodeNameEqual instead of xmlStrEqual
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
src/conf/cpu_conf.c | 2 +-
src/conf/domain_conf.c | 212 +++++++++++++++++------------------
src/conf/interface_conf.c | 2 +-
src/conf/netdev_bandwidth_conf.c | 6 +-
src/conf/netdev_vport_profile_conf.c | 2 +-
src/conf/network_conf.c | 12 +-
src/conf/node_device_conf.c | 2 +-
src/conf/nwfilter_conf.c | 6 +-
src/conf/nwfilter_params.c | 2 +-
src/conf/secret_conf.c | 2 +-
src/conf/snapshot_conf.c | 2 +-
src/conf/storage_conf.c | 4 +-
src/conf/virnetworkobj.c | 2 +-
src/conf/virsavecookie.c | 2 +-
src/esx/esx_vi_types.c | 9 +-
src/security/virt-aa-helper.c | 2 +-
src/test/test_driver.c | 2 +-
src/vz/vz_sdk.c | 2 +-
tools/virsh-domain.c | 18 +--
tools/virsh-interface.c | 12 +-
20 files changed, 152 insertions(+), 151 deletions(-)
diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
index 065b4df997..cdb8583647 100644
--- a/src/conf/cpu_conf.c
+++ b/src/conf/cpu_conf.c
@@ -280,7 +280,7 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt,
goto cleanup;
}
- if (!xmlStrEqual(ctxt->node->name, BAD_CAST "cpu")) {
+ if (!virXMLNodeNameEqual(ctxt->node, "cpu")) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("XML does not contain expected 'cpu'
element"));
goto cleanup;
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index b487ff2fdf..37aa975eca 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -1202,9 +1202,9 @@ virDomainBlkioDeviceParseXML(xmlNodePtr root,
node = root->children;
while (node) {
if (node->type == XML_ELEMENT_NODE) {
- if (xmlStrEqual(node->name, BAD_CAST "path") &&
!dev->path) {
+ if (virXMLNodeNameEqual(node, "path") && !dev->path) {
dev->path = (char *)xmlNodeGetContent(node);
- } else if (xmlStrEqual(node->name, BAD_CAST "weight")) {
+ } else if (virXMLNodeNameEqual(node, "weight")) {
c = (char *)xmlNodeGetContent(node);
if (virStrToLong_ui(c, NULL, 10, &dev->weight) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
@@ -1213,7 +1213,7 @@ virDomainBlkioDeviceParseXML(xmlNodePtr root,
goto error;
}
VIR_FREE(c);
- } else if (xmlStrEqual(node->name, BAD_CAST "read_bytes_sec"))
{
+ } else if (virXMLNodeNameEqual(node, "read_bytes_sec")) {
c = (char *)xmlNodeGetContent(node);
if (virStrToLong_ull(c, NULL, 10, &dev->rbps) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
@@ -1222,7 +1222,7 @@ virDomainBlkioDeviceParseXML(xmlNodePtr root,
goto error;
}
VIR_FREE(c);
- } else if (xmlStrEqual(node->name, BAD_CAST "write_bytes_sec"))
{
+ } else if (virXMLNodeNameEqual(node, "write_bytes_sec")) {
c = (char *)xmlNodeGetContent(node);
if (virStrToLong_ull(c, NULL, 10, &dev->wbps) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
@@ -1231,7 +1231,7 @@ virDomainBlkioDeviceParseXML(xmlNodePtr root,
goto error;
}
VIR_FREE(c);
- } else if (xmlStrEqual(node->name, BAD_CAST "read_iops_sec")) {
+ } else if (virXMLNodeNameEqual(node, "read_iops_sec")) {
c = (char *)xmlNodeGetContent(node);
if (virStrToLong_ui(c, NULL, 10, &dev->riops) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
@@ -1240,7 +1240,7 @@ virDomainBlkioDeviceParseXML(xmlNodePtr root,
goto error;
}
VIR_FREE(c);
- } else if (xmlStrEqual(node->name, BAD_CAST "write_iops_sec"))
{
+ } else if (virXMLNodeNameEqual(node, "write_iops_sec")) {
c = (char *)xmlNodeGetContent(node);
if (virStrToLong_ui(c, NULL, 10, &dev->wiops) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
@@ -5913,21 +5913,21 @@ virDomainDeviceInfoParseXML(xmlNodePtr node,
if (cur->type == XML_ELEMENT_NODE) {
if (alias == NULL &&
!(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE) &&
- xmlStrEqual(cur->name, BAD_CAST "alias")) {
+ virXMLNodeNameEqual(cur, "alias")) {
alias = cur;
} else if (address == NULL &&
- xmlStrEqual(cur->name, BAD_CAST "address")) {
+ virXMLNodeNameEqual(cur, "address")) {
address = cur;
} else if (master == NULL &&
- xmlStrEqual(cur->name, BAD_CAST "master")) {
+ virXMLNodeNameEqual(cur, "master")) {
master = cur;
} else if (boot == NULL &&
(flags & VIR_DOMAIN_DEF_PARSE_ALLOW_BOOT) &&
- xmlStrEqual(cur->name, BAD_CAST "boot")) {
+ virXMLNodeNameEqual(cur, "boot")) {
boot = cur;
} else if (rom == NULL &&
(flags & VIR_DOMAIN_DEF_PARSE_ALLOW_ROM) &&
- xmlStrEqual(cur->name, BAD_CAST "rom")) {
+ virXMLNodeNameEqual(cur, "rom")) {
rom = cur;
}
}
@@ -6105,7 +6105,7 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node,
cur = node->children;
while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE) {
- if (xmlStrEqual(cur->name, BAD_CAST "vendor")) {
+ if (virXMLNodeNameEqual(cur, "vendor")) {
char *vendor = virXMLPropString(cur, "id");
if (vendor) {
@@ -6122,7 +6122,7 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node,
"%s", _("usb vendor needs id"));
goto out;
}
- } else if (xmlStrEqual(cur->name, BAD_CAST "product")) {
+ } else if (virXMLNodeNameEqual(cur, "product")) {
char* product = virXMLPropString(cur, "id");
if (product) {
@@ -6141,7 +6141,7 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node,
"%s", _("usb product needs id"));
goto out;
}
- } else if (xmlStrEqual(cur->name, BAD_CAST "address")) {
+ } else if (virXMLNodeNameEqual(cur, "address")) {
char *bus, *device;
bus = virXMLPropString(cur, "bus");
@@ -6223,11 +6223,11 @@ virDomainHostdevSubsysPCIOrigStatesDefParseXML(xmlNodePtr node,
while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE) {
- if (xmlStrEqual(cur->name, BAD_CAST "unbind")) {
+ if (virXMLNodeNameEqual(cur, "unbind")) {
def->states.pci.unbind_from_stub = true;
- } else if (xmlStrEqual(cur->name, BAD_CAST "removeslot")) {
+ } else if (virXMLNodeNameEqual(cur, "removeslot")) {
def->states.pci.remove_slot = true;
- } else if (xmlStrEqual(cur->name, BAD_CAST "reprobe")) {
+ } else if (virXMLNodeNameEqual(cur, "reprobe")) {
def->states.pci.reprobe = true;
} else {
virReportError(VIR_ERR_INTERNAL_ERROR,
@@ -6253,14 +6253,14 @@ virDomainHostdevSubsysPCIDefParseXML(xmlNodePtr node,
cur = node->children;
while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE) {
- if (xmlStrEqual(cur->name, BAD_CAST "address")) {
+ if (virXMLNodeNameEqual(cur, "address")) {
virPCIDeviceAddressPtr addr =
&def->source.subsys.u.pci.addr;
if (virPCIDeviceAddressParseXML(cur, addr) < 0)
goto out;
} else if ((flags & VIR_DOMAIN_DEF_PARSE_STATUS) &&
- xmlStrEqual(cur->name, BAD_CAST "state")) {
+ virXMLNodeNameEqual(cur, "state")) {
/* Legacy back-compat. Don't add any more attributes here */
char *devaddr = virXMLPropString(cur, "devaddr");
if (devaddr &&
@@ -6274,7 +6274,7 @@ virDomainHostdevSubsysPCIDefParseXML(xmlNodePtr node,
}
def->info->type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI;
} else if ((flags & VIR_DOMAIN_DEF_PARSE_PCI_ORIG_STATES) &&
- xmlStrEqual(cur->name, BAD_CAST "origstates")) {
+ virXMLNodeNameEqual(cur, "origstates")) {
virDomainHostdevOrigStatesPtr states = &def->origstates;
if (virDomainHostdevSubsysPCIOrigStatesDefParseXML(cur, states) < 0)
goto out;
@@ -6371,7 +6371,7 @@ virDomainStorageNetworkParseHosts(xmlNodePtr node,
for (child = node->children; child; child = child->next) {
if (child->type == XML_ELEMENT_NODE &&
- xmlStrEqual(child->name, BAD_CAST "host")) {
+ virXMLNodeNameEqual(child, "host")) {
if (virDomainStorageNetworkParseHost(child, hosts, nhosts) < 0)
return -1;
@@ -6395,7 +6395,7 @@ virDomainHostdevSubsysSCSIHostDefParseXML(xmlNodePtr sourcenode,
cur = sourcenode->children;
while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE) {
- if (xmlStrEqual(cur->name, BAD_CAST "address")) {
+ if (virXMLNodeNameEqual(cur, "address")) {
if (got_address) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("more than one source addresses is "
@@ -6432,7 +6432,7 @@ virDomainHostdevSubsysSCSIHostDefParseXML(xmlNodePtr sourcenode,
}
got_address = true;
- } else if (xmlStrEqual(cur->name, BAD_CAST "adapter")) {
+ } else if (virXMLNodeNameEqual(cur, "adapter")) {
if (got_adapter) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("more than one adapters is specified "
@@ -6508,7 +6508,7 @@ virDomainHostdevSubsysSCSIiSCSIDefParseXML(xmlNodePtr sourcenode,
cur = sourcenode->children;
while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE &&
- xmlStrEqual(cur->name, BAD_CAST "auth")) {
+ virXMLNodeNameEqual(cur, "auth")) {
if (!(authdef = virStorageAuthDefParse(sourcenode->doc, cur)))
goto cleanup;
if ((auth_secret_usage =
@@ -7591,13 +7591,13 @@ virDomainLeaseDefParseXML(xmlNodePtr node)
cur = node->children;
while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE) {
- if (!key && xmlStrEqual(cur->name, BAD_CAST "key")) {
+ if (!key && virXMLNodeNameEqual(cur, "key")) {
key = (char *)xmlNodeGetContent(cur);
} else if (!lockspace &&
- xmlStrEqual(cur->name, BAD_CAST "lockspace")) {
+ virXMLNodeNameEqual(cur, "lockspace")) {
lockspace = (char *)xmlNodeGetContent(cur);
} else if (!path &&
- xmlStrEqual(cur->name, BAD_CAST "target")) {
+ virXMLNodeNameEqual(cur, "target")) {
path = virXMLPropString(cur, "path");
offset = virXMLPropString(cur, "offset");
}
@@ -8346,7 +8346,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
if (cur->type != XML_ELEMENT_NODE)
continue;
- if (!source && xmlStrEqual(cur->name, BAD_CAST "source")) {
+ if (!source && virXMLNodeNameEqual(cur, "source")) {
sourceNode = cur;
if (virDomainDiskSourceParse(cur, ctxt, def->src) < 0)
@@ -8364,7 +8364,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
startupPolicy = virXMLPropString(cur, "startupPolicy");
} else if (!target &&
- xmlStrEqual(cur->name, BAD_CAST "target")) {
+ virXMLNodeNameEqual(cur, "target")) {
target = virXMLPropString(cur, "dev");
bus = virXMLPropString(cur, "bus");
tray = virXMLPropString(cur, "tray");
@@ -8376,12 +8376,12 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
STRPREFIX(target, "ioemu:"))
memmove(target, target+6, strlen(target)-5);
} else if (!domain_name &&
- xmlStrEqual(cur->name, BAD_CAST "backenddomain")) {
+ virXMLNodeNameEqual(cur, "backenddomain")) {
domain_name = virXMLPropString(cur, "name");
- } else if (xmlStrEqual(cur->name, BAD_CAST "geometry")) {
+ } else if (virXMLNodeNameEqual(cur, "geometry")) {
if (virDomainDiskDefGeometryParse(def, cur, ctxt) < 0)
goto error;
- } else if (xmlStrEqual(cur->name, BAD_CAST "blockio")) {
+ } else if (virXMLNodeNameEqual(cur, "blockio")) {
logical_block_size =
virXMLPropString(cur, "logical_block_size");
if (logical_block_size &&
@@ -8403,16 +8403,16 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
goto error;
}
} else if (!def->src->driverName &&
- xmlStrEqual(cur->name, BAD_CAST "driver")) {
+ virXMLNodeNameEqual(cur, "driver")) {
if (virDomainDiskDefDriverParseXML(def, cur) < 0)
goto error;
} else if (!def->mirror &&
- xmlStrEqual(cur->name, BAD_CAST "mirror") &&
+ virXMLNodeNameEqual(cur, "mirror") &&
!(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE)) {
if (virDomainDiskDefMirrorParse(def, cur, ctxt) < 0)
goto error;
} else if (!authdef &&
- xmlStrEqual(cur->name, BAD_CAST "auth")) {
+ virXMLNodeNameEqual(cur, "auth")) {
if (!(authdef = virStorageAuthDefParse(node->doc, cur)))
goto error;
/* Disk volume types won't have the secrettype filled in until
@@ -8426,36 +8426,36 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
authdef->secrettype);
goto error;
}
- } else if (xmlStrEqual(cur->name, BAD_CAST "iotune")) {
+ } else if (virXMLNodeNameEqual(cur, "iotune")) {
if (virDomainDiskDefIotuneParse(def, ctxt) < 0)
goto error;
- } else if (xmlStrEqual(cur->name, BAD_CAST "readonly")) {
+ } else if (virXMLNodeNameEqual(cur, "readonly")) {
def->src->readonly = true;
- } else if (xmlStrEqual(cur->name, BAD_CAST "shareable")) {
+ } else if (virXMLNodeNameEqual(cur, "shareable")) {
def->src->shared = true;
- } else if (xmlStrEqual(cur->name, BAD_CAST "transient")) {
+ } else if (virXMLNodeNameEqual(cur, "transient")) {
def->transient = true;
} else if ((flags & VIR_DOMAIN_DEF_PARSE_STATUS) &&
- xmlStrEqual(cur->name, BAD_CAST "state")) {
+ virXMLNodeNameEqual(cur, "state")) {
/* Legacy back-compat. Don't add any more attributes here */
devaddr = virXMLPropString(cur, "devaddr");
} else if (encryption == NULL &&
- xmlStrEqual(cur->name, BAD_CAST "encryption")) {
+ virXMLNodeNameEqual(cur, "encryption")) {
encryption = virStorageEncryptionParseNode(node->doc,
cur);
if (encryption == NULL)
goto error;
} else if (!serial &&
- xmlStrEqual(cur->name, BAD_CAST "serial")) {
+ virXMLNodeNameEqual(cur, "serial")) {
serial = (char *)xmlNodeGetContent(cur);
} else if (!wwn &&
- xmlStrEqual(cur->name, BAD_CAST "wwn")) {
+ virXMLNodeNameEqual(cur, "wwn")) {
wwn = (char *)xmlNodeGetContent(cur);
if (!virValidateWWN(wwn))
goto error;
} else if (!vendor &&
- xmlStrEqual(cur->name, BAD_CAST "vendor")) {
+ virXMLNodeNameEqual(cur, "vendor")) {
vendor = (char *)xmlNodeGetContent(cur);
if (strlen(vendor) > VENDOR_LEN) {
@@ -8470,7 +8470,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
goto error;
}
} else if (!product &&
- xmlStrEqual(cur->name, BAD_CAST "product")) {
+ virXMLNodeNameEqual(cur, "product")) {
product = (char *)xmlNodeGetContent(cur);
if (strlen(product) > PRODUCT_LEN) {
@@ -8484,7 +8484,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
_("disk product is not printable string"));
goto error;
}
- } else if (xmlStrEqual(cur->name, BAD_CAST "boot")) {
+ } else if (virXMLNodeNameEqual(cur, "boot")) {
/* boot is parsed as part of virDomainDeviceInfoParseXML */
}
}
@@ -9070,13 +9070,13 @@ virDomainControllerDefParseXML(xmlNodePtr node,
cur = node->children;
while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE) {
- if (xmlStrEqual(cur->name, BAD_CAST "driver")) {
+ if (virXMLNodeNameEqual(cur, "driver")) {
queues = virXMLPropString(cur, "queues");
cmd_per_lun = virXMLPropString(cur, "cmd_per_lun");
max_sectors = virXMLPropString(cur, "max_sectors");
ioeventfd = virXMLPropString(cur, "ioeventfd");
iothread = virXMLPropString(cur, "iothread");
- } else if (xmlStrEqual(cur->name, BAD_CAST "model")) {
+ } else if (virXMLNodeNameEqual(cur, "model")) {
if (processedModel) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("Multiple <model> elements in "
@@ -9085,7 +9085,7 @@ virDomainControllerDefParseXML(xmlNodePtr node,
}
modelName = virXMLPropString(cur, "name");
processedModel = true;
- } else if (xmlStrEqual(cur->name, BAD_CAST "target")) {
+ } else if (virXMLNodeNameEqual(cur, "target")) {
if (processedTarget) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("Multiple <target> elements in "
@@ -9450,7 +9450,7 @@ virDomainFSDefParseXML(xmlNodePtr node,
while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE) {
if (!source &&
- xmlStrEqual(cur->name, BAD_CAST "source")) {
+ virXMLNodeNameEqual(cur, "source")) {
if (def->type == VIR_DOMAIN_FS_TYPE_MOUNT ||
def->type == VIR_DOMAIN_FS_TYPE_BIND) {
@@ -9470,11 +9470,11 @@ virDomainFSDefParseXML(xmlNodePtr node,
goto error;
}
} else if (!target &&
- xmlStrEqual(cur->name, BAD_CAST "target")) {
+ virXMLNodeNameEqual(cur, "target")) {
target = virXMLPropString(cur, "dir");
- } else if (xmlStrEqual(cur->name, BAD_CAST "readonly")) {
+ } else if (virXMLNodeNameEqual(cur, "readonly")) {
def->readonly = true;
- } else if (xmlStrEqual(cur->name, BAD_CAST "driver")) {
+ } else if (virXMLNodeNameEqual(cur, "driver")) {
if (!fsdriver)
fsdriver = virXMLPropString(cur, "type");
if (!wrpolicy)
@@ -9857,7 +9857,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
cur = node->children;
while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE) {
- if (xmlStrEqual(cur->name, BAD_CAST "source")) {
+ if (virXMLNodeNameEqual(cur, "source")) {
xmlNodePtr tmpnode = ctxt->node;
ctxt->node = cur;
@@ -9866,27 +9866,27 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
goto error;
ctxt->node = tmpnode;
}
- if (!macaddr && xmlStrEqual(cur->name, BAD_CAST "mac"))
{
+ if (!macaddr && virXMLNodeNameEqual(cur, "mac")) {
macaddr = virXMLPropString(cur, "address");
} else if (!network &&
def->type == VIR_DOMAIN_NET_TYPE_NETWORK &&
- xmlStrEqual(cur->name, BAD_CAST "source")) {
+ virXMLNodeNameEqual(cur, "source")) {
network = virXMLPropString(cur, "network");
portgroup = virXMLPropString(cur, "portgroup");
} else if (!internal &&
def->type == VIR_DOMAIN_NET_TYPE_INTERNAL &&
- xmlStrEqual(cur->name, BAD_CAST "source")) {
+ virXMLNodeNameEqual(cur, "source")) {
internal = virXMLPropString(cur, "name");
} else if (!bridge &&
def->type == VIR_DOMAIN_NET_TYPE_BRIDGE &&
- xmlStrEqual(cur->name, BAD_CAST "source")) {
+ virXMLNodeNameEqual(cur, "source")) {
bridge = virXMLPropString(cur, "bridge");
} else if (!dev && def->type == VIR_DOMAIN_NET_TYPE_DIRECT
&&
- xmlStrEqual(cur->name, BAD_CAST "source")) {
+ virXMLNodeNameEqual(cur, "source")) {
dev = virXMLPropString(cur, "dev");
mode = virXMLPropString(cur, "mode");
} else if (!dev && def->type == VIR_DOMAIN_NET_TYPE_ETHERNET
&&
- xmlStrEqual(cur->name, BAD_CAST "source")) {
+ virXMLNodeNameEqual(cur, "source")) {
/* This clause is only necessary because from 2010 to
* 2016 it was possible (but never documented) to
* configure the name of the guest-side interface of
@@ -9908,12 +9908,12 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
}
} else if (!vhostuser_path && !vhostuser_mode &&
!vhostuser_type
&& def->type == VIR_DOMAIN_NET_TYPE_VHOSTUSER
&&
- xmlStrEqual(cur->name, BAD_CAST "source")) {
+ virXMLNodeNameEqual(cur, "source")) {
vhostuser_type = virXMLPropString(cur, "type");
vhostuser_path = virXMLPropString(cur, "path");
vhostuser_mode = virXMLPropString(cur, "mode");
} else if (!def->virtPortProfile
- && xmlStrEqual(cur->name, BAD_CAST
"virtualport")) {
+ && virXMLNodeNameEqual(cur, "virtualport")) {
if (def->type == VIR_DOMAIN_NET_TYPE_NETWORK) {
if (!(def->virtPortProfile
= virNetDevVPortProfileParse(cur,
@@ -9941,7 +9941,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
def->type == VIR_DOMAIN_NET_TYPE_CLIENT ||
def->type == VIR_DOMAIN_NET_TYPE_MCAST ||
def->type == VIR_DOMAIN_NET_TYPE_UDP) &&
- xmlStrEqual(cur->name, BAD_CAST "source")) {
+ virXMLNodeNameEqual(cur, "source")) {
address = virXMLPropString(cur, "address");
port = virXMLPropString(cur, "port");
if (!localaddr && def->type == VIR_DOMAIN_NET_TYPE_UDP) {
@@ -9952,7 +9952,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
ctxt->node = tmpnode;
}
} else if (!ifname &&
- xmlStrEqual(cur->name, BAD_CAST "target")) {
+ virXMLNodeNameEqual(cur, "target")) {
ifname = virXMLPropString(cur, "dev");
if (ifname &&
(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE) &&
@@ -9962,21 +9962,21 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
VIR_FREE(ifname);
}
} else if ((!ifname_guest || !ifname_guest_actual) &&
- xmlStrEqual(cur->name, BAD_CAST "guest")) {
+ virXMLNodeNameEqual(cur, "guest")) {
ifname_guest = virXMLPropString(cur, "dev");
ifname_guest_actual = virXMLPropString(cur, "actual");
} else if (!linkstate &&
- xmlStrEqual(cur->name, BAD_CAST "link")) {
+ virXMLNodeNameEqual(cur, "link")) {
linkstate = virXMLPropString(cur, "state");
} else if (!script &&
- xmlStrEqual(cur->name, BAD_CAST "script")) {
+ virXMLNodeNameEqual(cur, "script")) {
script = virXMLPropString(cur, "path");
} else if (!domain_name &&
- xmlStrEqual(cur->name, BAD_CAST "backenddomain")) {
+ virXMLNodeNameEqual(cur, "backenddomain")) {
domain_name = virXMLPropString(cur, "name");
- } else if (xmlStrEqual(cur->name, BAD_CAST "model")) {
+ } else if (virXMLNodeNameEqual(cur, "model")) {
model = virXMLPropString(cur, "type");
- } else if (xmlStrEqual(cur->name, BAD_CAST "driver")) {
+ } else if (virXMLNodeNameEqual(cur, "driver")) {
backend = virXMLPropString(cur, "name");
txmode = virXMLPropString(cur, "txmode");
ioeventfd = virXMLPropString(cur, "ioeventfd");
@@ -9984,7 +9984,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
queues = virXMLPropString(cur, "queues");
rx_queue_size = virXMLPropString(cur, "rx_queue_size");
tx_queue_size = virXMLPropString(cur, "tx_queue_size");
- } else if (xmlStrEqual(cur->name, BAD_CAST "filterref")) {
+ } else if (virXMLNodeNameEqual(cur, "filterref")) {
if (filter) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("Invalid specification of multiple
<filterref>s "
@@ -9995,28 +9995,28 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
virNWFilterHashTableFree(filterparams);
filterparams = virNWFilterParseParamAttributes(cur);
} else if ((flags & VIR_DOMAIN_DEF_PARSE_STATUS) &&
- xmlStrEqual(cur->name, BAD_CAST "state")) {
+ virXMLNodeNameEqual(cur, "state")) {
/* Legacy back-compat. Don't add any more attributes here */
devaddr = virXMLPropString(cur, "devaddr");
- } else if (xmlStrEqual(cur->name, BAD_CAST "boot")) {
+ } else if (virXMLNodeNameEqual(cur, "boot")) {
/* boot is parsed as part of virDomainDeviceInfoParseXML */
} else if (!actual &&
(flags & VIR_DOMAIN_DEF_PARSE_ACTUAL_NET) &&
def->type == VIR_DOMAIN_NET_TYPE_NETWORK &&
- xmlStrEqual(cur->name, BAD_CAST "actual")) {
+ virXMLNodeNameEqual(cur, "actual")) {
if (virDomainActualNetDefParseXML(cur, ctxt, def,
&actual, flags) < 0) {
goto error;
}
- } else if (xmlStrEqual(cur->name, BAD_CAST "bandwidth")) {
+ } else if (virXMLNodeNameEqual(cur, "bandwidth")) {
if (virNetDevBandwidthParse(&def->bandwidth,
cur,
def->type) < 0)
goto error;
- } else if (xmlStrEqual(cur->name, BAD_CAST "vlan")) {
+ } else if (virXMLNodeNameEqual(cur, "vlan")) {
if (virNetDevVlanParse(cur, ctxt, &def->vlan) < 0)
goto error;
- } else if (xmlStrEqual(cur->name, BAD_CAST "backend")) {
+ } else if (virXMLNodeNameEqual(cur, "backend")) {
char *tmp = NULL;
if ((tmp = virXMLPropString(cur, "tap")))
@@ -10823,7 +10823,7 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def,
while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE) {
- if (xmlStrEqual(cur->name, BAD_CAST "source")) {
+ if (virXMLNodeNameEqual(cur, "source")) {
if (!mode)
mode = virXMLPropString(cur, "mode");
if (!haveTLS)
@@ -10904,12 +10904,12 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def,
}
ctxt->node = saved_node;
}
- } else if (xmlStrEqual(cur->name, BAD_CAST "log")) {
+ } else if (virXMLNodeNameEqual(cur, "log")) {
if (!logfile)
logfile = virXMLPropString(cur, "file");
if (!logappend)
logappend = virXMLPropString(cur, "append");
- } else if (xmlStrEqual(cur->name, BAD_CAST "protocol")) {
+ } else if (virXMLNodeNameEqual(cur, "protocol")) {
if (!protocol)
protocol = virXMLPropString(cur, "type");
} else {
@@ -11239,7 +11239,7 @@ virDomainChrDefParseXML(virDomainXMLOptionPtr xmlopt,
cur = node->children;
while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE) {
- if (xmlStrEqual(cur->name, BAD_CAST "target")) {
+ if (virXMLNodeNameEqual(cur, "target")) {
seenTarget = true;
if (virDomainChrDefParseTargetXML(def, cur, flags) < 0)
goto error;
@@ -11331,7 +11331,7 @@ virDomainSmartcardDefParseXML(virDomainXMLOptionPtr xmlopt,
cur = node->children;
while (cur) {
if (cur->type == XML_ELEMENT_NODE &&
- xmlStrEqual(cur->name, BAD_CAST "certificate")) {
+ virXMLNodeNameEqual(cur, "certificate")) {
if (i == 3) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("host-certificates mode needs "
@@ -11345,7 +11345,7 @@ virDomainSmartcardDefParseXML(virDomainXMLOptionPtr xmlopt,
}
i++;
} else if (cur->type == XML_ELEMENT_NODE &&
- xmlStrEqual(cur->name, BAD_CAST "database")
&&
+ virXMLNodeNameEqual(cur, "database") &&
!def->data.cert.database) {
def->data.cert.database = (char *)xmlNodeGetContent(cur);
if (!def->data.cert.database) {
@@ -12477,7 +12477,7 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
cur = node->children;
while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE) {
- if (xmlStrEqual(cur->name, BAD_CAST "channel")) {
+ if (virXMLNodeNameEqual(cur, "channel")) {
char *name, *mode;
int nameval, modeval;
name = virXMLPropString(cur, "name");
@@ -12511,7 +12511,7 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
VIR_FREE(mode);
def->data.spice.channels[nameval] = modeval;
- } else if (xmlStrEqual(cur->name, BAD_CAST "image")) {
+ } else if (virXMLNodeNameEqual(cur, "image")) {
char *compression = virXMLPropString(cur, "compression");
int compressionVal;
@@ -12532,7 +12532,7 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
VIR_FREE(compression);
def->data.spice.image = compressionVal;
- } else if (xmlStrEqual(cur->name, BAD_CAST "jpeg")) {
+ } else if (virXMLNodeNameEqual(cur, "jpeg")) {
char *compression = virXMLPropString(cur, "compression");
int compressionVal;
@@ -12553,7 +12553,7 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
VIR_FREE(compression);
def->data.spice.jpeg = compressionVal;
- } else if (xmlStrEqual(cur->name, BAD_CAST "zlib")) {
+ } else if (virXMLNodeNameEqual(cur, "zlib")) {
char *compression = virXMLPropString(cur, "compression");
int compressionVal;
@@ -12574,7 +12574,7 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
VIR_FREE(compression);
def->data.spice.zlib = compressionVal;
- } else if (xmlStrEqual(cur->name, BAD_CAST "playback")) {
+ } else if (virXMLNodeNameEqual(cur, "playback")) {
char *compression = virXMLPropString(cur, "compression");
int compressionVal;
@@ -12595,7 +12595,7 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
VIR_FREE(compression);
def->data.spice.playback = compressionVal;
- } else if (xmlStrEqual(cur->name, BAD_CAST "streaming")) {
+ } else if (virXMLNodeNameEqual(cur, "streaming")) {
char *mode = virXMLPropString(cur, "mode");
int modeVal;
@@ -12615,7 +12615,7 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
VIR_FREE(mode);
def->data.spice.streaming = modeVal;
- } else if (xmlStrEqual(cur->name, BAD_CAST "clipboard")) {
+ } else if (virXMLNodeNameEqual(cur, "clipboard")) {
char *copypaste = virXMLPropString(cur, "copypaste");
int copypasteVal;
@@ -12635,7 +12635,7 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
VIR_FREE(copypaste);
def->data.spice.copypaste = copypasteVal;
- } else if (xmlStrEqual(cur->name, BAD_CAST "filetransfer")) {
+ } else if (virXMLNodeNameEqual(cur, "filetransfer")) {
char *enable = virXMLPropString(cur, "enable");
int enableVal;
@@ -12655,7 +12655,7 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
VIR_FREE(enable);
def->data.spice.filetransfer = enableVal;
- } else if (xmlStrEqual(cur->name, BAD_CAST "gl")) {
+ } else if (virXMLNodeNameEqual(cur, "gl")) {
char *enable = virXMLPropString(cur, "enable");
char *rendernode = virXMLPropString(cur, "rendernode");
int enableVal;
@@ -12680,7 +12680,7 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
def->data.spice.gl = enableVal;
def->data.spice.rendernode = rendernode;
- } else if (xmlStrEqual(cur->name, BAD_CAST "mouse")) {
+ } else if (virXMLNodeNameEqual(cur, "mouse")) {
char *mode = virXMLPropString(cur, "mode");
int modeVal;
@@ -13237,7 +13237,7 @@ virSysinfoBIOSParseXML(xmlNodePtr node,
int ret = -1;
virSysinfoBIOSDefPtr def;
- if (!xmlStrEqual(node->name, BAD_CAST "bios")) {
+ if (!virXMLNodeNameEqual(node, "bios")) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("XML does not contain expected 'bios'
element"));
return ret;
@@ -13299,7 +13299,7 @@ virSysinfoSystemParseXML(xmlNodePtr node,
virSysinfoSystemDefPtr def;
char *tmpUUID = NULL;
- if (!xmlStrEqual(node->name, BAD_CAST "system")) {
+ if (!virXMLNodeNameEqual(node, "system")) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("XML does not contain expected 'system'
element"));
return ret;
@@ -13427,7 +13427,7 @@ virSysinfoParseXML(xmlNodePtr node,
xmlNodePtr oldnode, tmpnode;
char *type;
- if (!xmlStrEqual(node->name, BAD_CAST "sysinfo")) {
+ if (!virXMLNodeNameEqual(node, "sysinfo")) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("XML does not contain expected 'sysinfo'
element"));
return NULL;
@@ -13564,7 +13564,7 @@ virDomainVideoAccelDefParseXML(xmlNodePtr node)
while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE) {
if (!accel3d && !accel2d &&
- xmlStrEqual(cur->name, BAD_CAST "acceleration")) {
+ virXMLNodeNameEqual(cur, "acceleration")) {
accel3d = virXMLPropString(cur, "accel3d");
accel2d = virXMLPropString(cur, "accel2d");
}
@@ -13614,7 +13614,7 @@ virDomainVideoDriverDefParseXML(xmlNodePtr node)
while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE) {
if (!vgaconf &&
- xmlStrEqual(cur->name, BAD_CAST "driver")) {
+ virXMLNodeNameEqual(cur, "driver")) {
vgaconf = virXMLPropString(cur, "vgaconf");
}
}
@@ -13665,7 +13665,7 @@ virDomainVideoDefParseXML(xmlNodePtr node,
while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE) {
if (!type && !vram && !ram && !heads &&
- xmlStrEqual(cur->name, BAD_CAST "model")) {
+ virXMLNodeNameEqual(cur, "model")) {
type = virXMLPropString(cur, "type");
ram = virXMLPropString(cur, "ram");
vram = virXMLPropString(cur, "vram");
@@ -14516,10 +14516,10 @@ virDomainDeviceDefParse(const char *xmlStr,
if ((dev->type = virDomainDeviceTypeFromString((const char *) node->name)) <
0) {
/* Some crazy mapping of serial, parallel, console and channel to
* VIR_DOMAIN_DEVICE_CHR. */
- if (xmlStrEqual(node->name, BAD_CAST "channel") ||
- xmlStrEqual(node->name, BAD_CAST "console") ||
- xmlStrEqual(node->name, BAD_CAST "parallel") ||
- xmlStrEqual(node->name, BAD_CAST "serial")) {
+ if (virXMLNodeNameEqual(node, "channel") ||
+ virXMLNodeNameEqual(node, "console") ||
+ virXMLNodeNameEqual(node, "parallel") ||
+ virXMLNodeNameEqual(node, "serial")) {
dev->type = VIR_DOMAIN_DEVICE_CHR;
} else {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
@@ -14681,7 +14681,7 @@ virDomainDiskDefSourceParse(const char *xmlStr,
goto cleanup;
node = ctxt->node;
- if (!xmlStrEqual(node->name, BAD_CAST "disk")) {
+ if (!virXMLNodeNameEqual(node, "disk")) {
virReportError(VIR_ERR_XML_ERROR,
_("expecting root element of 'disk', not
'%s'"),
node->name);
@@ -19044,7 +19044,7 @@ virDomainDefParseNode(xmlDocPtr xml,
xmlXPathContextPtr ctxt = NULL;
virDomainDefPtr def = NULL;
- if (!xmlStrEqual(root->name, BAD_CAST "domain")) {
+ if (!virXMLNodeNameEqual(root, "domain")) {
virReportError(VIR_ERR_XML_ERROR,
_("unexpected root element <%s>, "
"expecting <domain>"),
@@ -19077,7 +19077,7 @@ virDomainObjParseNode(xmlDocPtr xml,
xmlXPathContextPtr ctxt = NULL;
virDomainObjPtr obj = NULL;
- if (!xmlStrEqual(root->name, BAD_CAST "domstatus")) {
+ if (!virXMLNodeNameEqual(root, "domstatus")) {
virReportError(VIR_ERR_XML_ERROR,
_("unexpected root element <%s>, "
"expecting <domstatus>"),
diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c
index 8c46cf52d6..0a4b28f489 100644
--- a/src/conf/interface_conf.c
+++ b/src/conf/interface_conf.c
@@ -824,7 +824,7 @@ virInterfaceDefParseNode(xmlDocPtr xml,
xmlXPathContextPtr ctxt = NULL;
virInterfaceDefPtr def = NULL;
- if (!xmlStrEqual(root->name, BAD_CAST "interface")) {
+ if (!virXMLNodeNameEqual(root, "interface")) {
virReportError(VIR_ERR_XML_ERROR,
_("unexpected root element <%s>, "
"expecting <interface>"),
diff --git a/src/conf/netdev_bandwidth_conf.c b/src/conf/netdev_bandwidth_conf.c
index 50138fd29f..80b113196a 100644
--- a/src/conf/netdev_bandwidth_conf.c
+++ b/src/conf/netdev_bandwidth_conf.c
@@ -125,7 +125,7 @@ virNetDevBandwidthParse(virNetDevBandwidthPtr *bandwidth,
if (VIR_ALLOC(def) < 0)
return ret;
- if (!node || !xmlStrEqual(node->name, BAD_CAST "bandwidth")) {
+ if (!node || !virXMLNodeNameEqual(node, "bandwidth")) {
virReportError(VIR_ERR_INVALID_ARG, "%s",
_("invalid argument supplied"));
goto cleanup;
@@ -135,7 +135,7 @@ virNetDevBandwidthParse(virNetDevBandwidthPtr *bandwidth,
while (cur) {
if (cur->type == XML_ELEMENT_NODE) {
- if (xmlStrEqual(cur->name, BAD_CAST "inbound")) {
+ if (virXMLNodeNameEqual(cur, "inbound")) {
if (in) {
virReportError(VIR_ERR_XML_DETAIL, "%s",
_("Only one child <inbound> "
@@ -143,7 +143,7 @@ virNetDevBandwidthParse(virNetDevBandwidthPtr *bandwidth,
goto cleanup;
}
in = cur;
- } else if (xmlStrEqual(cur->name, BAD_CAST "outbound")) {
+ } else if (virXMLNodeNameEqual(cur, "outbound")) {
if (out) {
virReportError(VIR_ERR_XML_DETAIL, "%s",
_("Only one child <outbound> "
diff --git a/src/conf/netdev_vport_profile_conf.c b/src/conf/netdev_vport_profile_conf.c
index 1641a3e01e..58a50793c2 100644
--- a/src/conf/netdev_vport_profile_conf.c
+++ b/src/conf/netdev_vport_profile_conf.c
@@ -61,7 +61,7 @@ virNetDevVPortProfileParse(xmlNodePtr node, unsigned int flags)
}
while (cur != NULL) {
- if (xmlStrEqual(cur->name, BAD_CAST "parameters")) {
+ if (virXMLNodeNameEqual(cur, "parameters")) {
virtPortManagerID = virXMLPropString(cur, "managerid");
virtPortTypeID = virXMLPropString(cur, "typeid");
virtPortTypeIDVersion = virXMLPropString(cur, "typeidversion");
diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index 3ebf67ff5c..54109a3d2e 100644
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -529,7 +529,7 @@ virNetworkDHCPDefParseXML(const char *networkName,
cur = node->children;
while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE &&
- xmlStrEqual(cur->name, BAD_CAST "range")) {
+ virXMLNodeNameEqual(cur, "range")) {
if (virSocketAddrRangeParseXML(networkName, def, cur, &range) < 0)
goto cleanup;
@@ -537,7 +537,7 @@ virNetworkDHCPDefParseXML(const char *networkName,
goto cleanup;
} else if (cur->type == XML_ELEMENT_NODE &&
- xmlStrEqual(cur->name, BAD_CAST "host")) {
+ virXMLNodeNameEqual(cur, "host")) {
if (virNetworkDHCPHostDefParseXML(networkName, def, cur,
&host, false) < 0)
@@ -547,7 +547,7 @@ virNetworkDHCPDefParseXML(const char *networkName,
} else if (VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_INET) &&
cur->type == XML_ELEMENT_NODE &&
- xmlStrEqual(cur->name, BAD_CAST "bootp")) {
+ virXMLNodeNameEqual(cur, "bootp")) {
char *file;
char *server;
virSocketAddr inaddr;
@@ -609,7 +609,7 @@ virNetworkDNSHostDefParseXML(const char *networkName,
cur = node->children;
while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE &&
- xmlStrEqual(cur->name, BAD_CAST "hostname")) {
+ virXMLNodeNameEqual(cur, "hostname")) {
if (cur->children != NULL) {
char *name = (char *) xmlNodeGetContent(cur);
@@ -2034,7 +2034,7 @@ virNetworkDefParseNode(xmlDocPtr xml,
xmlXPathContextPtr ctxt = NULL;
virNetworkDefPtr def = NULL;
- if (!xmlStrEqual(root->name, BAD_CAST "network")) {
+ if (!virXMLNodeNameEqual(root, "network")) {
virReportError(VIR_ERR_XML_ERROR,
_("unexpected root element <%s>, "
"expecting <network>"),
@@ -2702,7 +2702,7 @@ virNetworkDefUpdateCheckElementName(virNetworkDefPtr def,
xmlNodePtr node,
const char *section)
{
- if (!xmlStrEqual(node->name, BAD_CAST section)) {
+ if (!virXMLNodeNameEqual(node, section)) {
virReportError(VIR_ERR_XML_ERROR,
_("unexpected element <%s>, expecting <%s>,
"
"while updating network '%s'"),
diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index 726bf042c8..bf84fd2b37 100644
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -2047,7 +2047,7 @@ virNodeDeviceDefParseNode(xmlDocPtr xml,
xmlXPathContextPtr ctxt = NULL;
virNodeDeviceDefPtr def = NULL;
- if (!xmlStrEqual(root->name, BAD_CAST "device")) {
+ if (!virXMLNodeNameEqual(root, "device")) {
virReportError(VIR_ERR_XML_ERROR,
_("unexpected root element <%s> "
"expecting <device>"),
diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c
index cb251b0344..5d6423e060 100644
--- a/src/conf/nwfilter_conf.c
+++ b/src/conf/nwfilter_conf.c
@@ -2452,7 +2452,7 @@ virNWFilterRuleParse(xmlNodePtr node)
if (found)
i = found_i;
- if (xmlStrEqual(cur->name, BAD_CAST virAttr[i].id)) {
+ if (virXMLNodeNameEqual(cur, virAttr[i].id)) {
found_i = i;
found = true;
@@ -2668,12 +2668,12 @@ virNWFilterDefParseXML(xmlXPathContextPtr ctxt)
if (VIR_ALLOC(entry) < 0)
goto cleanup;
- if (xmlStrEqual(curr->name, BAD_CAST "rule")) {
+ if (virXMLNodeNameEqual(curr, "rule")) {
if (!(entry->rule = virNWFilterRuleParse(curr))) {
virNWFilterEntryFree(entry);
goto cleanup;
}
- } else if (xmlStrEqual(curr->name, BAD_CAST "filterref")) {
+ } else if (virXMLNodeNameEqual(curr, "filterref")) {
if (!(entry->include = virNWFilterIncludeParse(curr))) {
virNWFilterEntryFree(entry);
goto cleanup;
diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c
index 496ffdabf8..3a01049182 100644
--- a/src/conf/nwfilter_params.c
+++ b/src/conf/nwfilter_params.c
@@ -810,7 +810,7 @@ virNWFilterParseParamAttributes(xmlNodePtr cur)
while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE) {
- if (xmlStrEqual(cur->name, BAD_CAST "parameter")) {
+ if (virXMLNodeNameEqual(cur, "parameter")) {
nam = virXMLPropString(cur, "name");
val = virXMLPropString(cur, "value");
value = NULL;
diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c
index 985bae47ed..bd085b7e41 100644
--- a/src/conf/secret_conf.c
+++ b/src/conf/secret_conf.c
@@ -131,7 +131,7 @@ secretXMLParseNode(xmlDocPtr xml, xmlNodePtr root)
char *prop = NULL;
char *uuidstr = NULL;
- if (!xmlStrEqual(root->name, BAD_CAST "secret")) {
+ if (!virXMLNodeNameEqual(root, "secret")) {
virReportError(VIR_ERR_XML_ERROR,
_("unexpected root element <%s>, "
"expecting <secret>"),
diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
index 6330f7d1f9..5a07d3734a 100644
--- a/src/conf/snapshot_conf.c
+++ b/src/conf/snapshot_conf.c
@@ -394,7 +394,7 @@ virDomainSnapshotDefParseNode(xmlDocPtr xml,
xmlXPathContextPtr ctxt = NULL;
virDomainSnapshotDefPtr def = NULL;
- if (!xmlStrEqual(root->name, BAD_CAST "domainsnapshot")) {
+ if (!virXMLNodeNameEqual(root, "domainsnapshot")) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("domainsnapshot"));
goto cleanup;
}
diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index b66e67254a..c35fa0e15c 100644
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -823,7 +823,7 @@ virStoragePoolDefParseNode(xmlDocPtr xml,
xmlXPathContextPtr ctxt = NULL;
virStoragePoolDefPtr def = NULL;
- if (!xmlStrEqual(root->name, BAD_CAST "pool")) {
+ if (!virXMLNodeNameEqual(root, "pool")) {
virReportError(VIR_ERR_XML_ERROR,
_("unexpected root element <%s>, "
"expecting <pool>"),
@@ -1267,7 +1267,7 @@ virStorageVolDefParseNode(virStoragePoolDefPtr pool,
xmlXPathContextPtr ctxt = NULL;
virStorageVolDefPtr def = NULL;
- if (!xmlStrEqual(root->name, BAD_CAST "volume")) {
+ if (!virXMLNodeNameEqual(root, "volume")) {
virReportError(VIR_ERR_XML_ERROR,
_("unexpected root element <%s>, "
"expecting <volume>"),
diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c
index d8eca1e90a..d2a23e6307 100644
--- a/src/conf/virnetworkobj.c
+++ b/src/conf/virnetworkobj.c
@@ -684,7 +684,7 @@ virNetworkLoadState(virNetworkObjListPtr nets,
/* now parse possible status data */
node = xmlDocGetRootElement(xml);
- if (xmlStrEqual(node->name, BAD_CAST "networkstatus")) {
+ if (virXMLNodeNameEqual(node, "networkstatus")) {
/* Newer network status file. Contains useful
* info which are not to be found in bare config XML */
char *class_id = NULL;
diff --git a/src/conf/virsavecookie.c b/src/conf/virsavecookie.c
index 502c04d0f4..37a3808481 100644
--- a/src/conf/virsavecookie.c
+++ b/src/conf/virsavecookie.c
@@ -39,7 +39,7 @@ virSaveCookieParseNode(xmlXPathContextPtr ctxt,
{
*obj = NULL;
- if (!xmlStrEqual(ctxt->node->name, BAD_CAST "cookie")) {
+ if (!virXMLNodeNameEqual(ctxt->node, "cookie")) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("XML does not contain expected 'cookie'
element"));
return -1;
diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c
index 6b558e59fb..3ad2ba2922 100644
--- a/src/esx/esx_vi_types.c
+++ b/src/esx/esx_vi_types.c
@@ -33,6 +33,7 @@
#include "esx_vi.h"
#include "esx_vi_types.h"
#include "virstring.h"
+#include "virxml.h"
#define VIR_FROM_THIS VIR_FROM_ESX
@@ -437,7 +438,7 @@ VIR_LOG_INIT("esx.esx_vi_types");
#define ESX_VI__TEMPLATE__PROPERTY__DESERIALIZE(_type, _name) \
- if (xmlStrEqual(childNode->name, BAD_CAST #_name)) { \
+ if (virXMLNodeNameEqual(childNode, #_name)) { \
if (esxVI_##_type##_Deserialize(childNode, &(*ptrptr)->_name) < 0) {
\
goto failure; \
} \
@@ -448,14 +449,14 @@ VIR_LOG_INIT("esx.esx_vi_types");
#define ESX_VI__TEMPLATE__PROPERTY__DESERIALIZE_IGNORE(_name) \
- if (xmlStrEqual(childNode->name, BAD_CAST #_name)) { \
+ if (virXMLNodeNameEqual(childNode, #_name)) { \
continue; \
}
#define ESX_VI__TEMPLATE__PROPERTY__DESERIALIZE_VALUE(_type, _name) \
- if (xmlStrEqual(childNode->name, BAD_CAST #_name)) { \
+ if (virXMLNodeNameEqual(childNode, #_name)) { \
if (esxVI_##_type##_DeserializeValue(childNode, \
&(*ptrptr)->_name) < 0) {
\
goto failure; \
@@ -467,7 +468,7 @@ VIR_LOG_INIT("esx.esx_vi_types");
#define ESX_VI__TEMPLATE__PROPERTY__DESERIALIZE_LIST(_type, _name) \
- if (xmlStrEqual(childNode->name, BAD_CAST #_name)) { \
+ if (virXMLNodeNameEqual(childNode, #_name)) { \
esxVI_##_type *_name##Item = NULL; \
\
if (esxVI_##_type##_Deserialize(childNode, &_name##Item) < 0) { \
diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index 35dcb35bc4..209ffaefb7 100644
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -616,7 +616,7 @@ caps_mockup(vahControl * ctl, const char *xmlStr)
goto cleanup;
}
- if (!xmlStrEqual(ctxt->node->name, BAD_CAST "domain")) {
+ if (!virXMLNodeNameEqual(ctxt->node, "domain")) {
vah_error(NULL, 0, _("unexpected root element, expecting
<domain>"));
goto cleanup;
}
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index bf1344b968..493460cc90 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -1232,7 +1232,7 @@ testOpenParse(testDriverPtr privconn,
const char *file,
xmlXPathContextPtr ctxt)
{
- if (!xmlStrEqual(ctxt->node->name, BAD_CAST "node")) {
+ if (!virXMLNodeNameEqual(ctxt->node, "node")) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("Root element is not 'node'"));
goto error;
diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
index c5f11a4fcd..52e18292df 100644
--- a/src/vz/vz_sdk.c
+++ b/src/vz/vz_sdk.c
@@ -4676,7 +4676,7 @@ prlsdkParseSnapshotTree(const char *treexml)
goto cleanup;
root = xmlDocGetRootElement(xml);
- if (!xmlStrEqual(root->name, BAD_CAST "ParallelsSavedStates")) {
+ if (!virXMLNodeNameEqual(root, "ParallelsSavedStates")) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("unexpected root element: '%s'"),
root->name);
goto cleanup;
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 512804ccc2..40f1673866 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -3061,7 +3061,7 @@ cmdDomIfSetLink(vshControl *ctl, const vshCmd *cmd)
while (cur) {
if (cur->type == XML_ELEMENT_NODE &&
- xmlStrEqual(cur->name, BAD_CAST element)) {
+ virXMLNodeNameEqual(cur, element)) {
value = virXMLPropString(cur, attr);
if (STRCASEEQ(value, iface)) {
@@ -3084,7 +3084,7 @@ cmdDomIfSetLink(vshControl *ctl, const vshCmd *cmd)
while (cur) {
if (cur->type == XML_ELEMENT_NODE &&
- xmlStrEqual(cur->name, BAD_CAST "link")) {
+ virXMLNodeNameEqual(cur, "link")) {
/* found, just modify the property */
xmlSetProp(cur, BAD_CAST "state", BAD_CAST state);
@@ -11704,7 +11704,7 @@ virshDomainDetachInterface(char *doc,
cur = obj->nodesetval->nodeTab[i]->children;
while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE &&
- xmlStrEqual(cur->name, BAD_CAST "mac")) {
+ virXMLNodeNameEqual(cur, "mac")) {
char *tmp_mac = virXMLPropString(cur, "address");
diff_mac = virMacAddrCompare(tmp_mac, mac);
VIR_FREE(tmp_mac);
@@ -11859,7 +11859,7 @@ virshFindDisk(const char *doc,
is_supported = false;
/* Check if the disk is CDROM or floppy disk */
- if (xmlStrEqual(n->name, BAD_CAST "disk")) {
+ if (virXMLNodeNameEqual(n, "disk")) {
char *device_value = virXMLPropString(n, "device");
if (STREQ(device_value, "cdrom") ||
@@ -11878,13 +11878,13 @@ virshFindDisk(const char *doc,
if (cur->type == XML_ELEMENT_NODE) {
char *tmp = NULL;
- if (xmlStrEqual(cur->name, BAD_CAST "source")) {
+ if (virXMLNodeNameEqual(cur, "source")) {
if ((tmp = virXMLPropString(cur, "file")) ||
(tmp = virXMLPropString(cur, "dev")) ||
(tmp = virXMLPropString(cur, "dir")) ||
(tmp = virXMLPropString(cur, "name"))) {
}
- } else if (xmlStrEqual(cur->name, BAD_CAST "target")) {
+ } else if (virXMLNodeNameEqual(cur, "target")) {
tmp = virXMLPropString(cur, "dev");
}
@@ -11963,13 +11963,13 @@ virshUpdateDiskXML(xmlNodePtr disk_node,
if (tmp->type != XML_ELEMENT_NODE)
continue;
- if (xmlStrEqual(tmp->name, BAD_CAST "source"))
+ if (virXMLNodeNameEqual(tmp, "source"))
source = tmp;
- if (xmlStrEqual(tmp->name, BAD_CAST "target"))
+ if (virXMLNodeNameEqual(tmp, "target"))
target_node = tmp;
- if (xmlStrEqual(tmp->name, BAD_CAST "backingStore"))
+ if (virXMLNodeNameEqual(tmp, "backingStore"))
backingStore = tmp;
/*
diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c
index 9f7d1bd0d4..25e21710f6 100644
--- a/tools/virsh-interface.c
+++ b/tools/virsh-interface.c
@@ -939,9 +939,9 @@ cmdInterfaceBridge(vshControl *ctl, const vshCmd *cmd)
cur = cur->next;
if ((old->type == XML_ELEMENT_NODE) &&
- (xmlStrEqual(old->name, BAD_CAST "mac") || /* ethernet stuff to
move down */
- xmlStrEqual(old->name, BAD_CAST "bond") || /* bond stuff to
move down */
- xmlStrEqual(old->name, BAD_CAST "vlan"))) { /* vlan stuff to
move down */
+ (virXMLNodeNameEqual(old, "mac") || /* ethernet stuff to move down
*/
+ virXMLNodeNameEqual(old, "bond") || /* bond stuff to move down */
+ virXMLNodeNameEqual(old, "vlan"))) { /* vlan stuff to move down
*/
xmlUnlinkNode(old);
if (!xmlAddChild(if_node, old)) {
vshError(ctl, _("Failed to move '%s' element in xml
document"), old->name);
@@ -1130,9 +1130,9 @@ cmdInterfaceUnbridge(vshControl *ctl, const vshCmd *cmd)
cur = cur->next;
if ((old->type == XML_ELEMENT_NODE) &&
- (xmlStrEqual(old->name, BAD_CAST "mac") || /* ethernet stuff to
move down */
- xmlStrEqual(old->name, BAD_CAST "bond") || /* bond stuff to
move down */
- xmlStrEqual(old->name, BAD_CAST "vlan"))) { /* vlan stuff to
move down */
+ (virXMLNodeNameEqual(old, "mac") || /* ethernet stuff to move down
*/
+ virXMLNodeNameEqual(old, "bond") || /* bond stuff to move down */
+ virXMLNodeNameEqual(old, "vlan"))) { /* vlan stuff to move down
*/
xmlUnlinkNode(old);
if (!xmlAddChild(top_node, old)) {
vshError(ctl, _("Failed to move '%s' element in xml
document"), old->name);
--
2.13.5
7:32 a.m.
New subject: [libvirt] [PATCH 3/8] conf: cleanup virDomainChrSourceDef parsing
The @remaining variable is leftover from old code and it's not
used anymore.
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
src/conf/domain_conf.c | 23 +++++++++--------------
1 file changed, 9 insertions(+), 14 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 37aa975eca..528d11c17d 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -10793,9 +10793,9 @@ virDomainChrDefParseTargetXML(virDomainChrDefPtr def,
/* Parse the source half of the XML definition for a character device,
* where node is the first element of node->children of the parent
- * element. def->type must already be valid. Return -1 on failure,
- * otherwise the number of ignored children (this intentionally skips
- * <target>, which is used by <serial> but not <smartcard>). */
+ * element. def->type must already be valid.
+ *
+ * Return -1 on failure, 0 on success. */
static int
virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def,
xmlNodePtr cur, unsigned int flags,
@@ -10804,6 +10804,7 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def,
virSecurityLabelDefPtr* vmSeclabels,
int nvmSeclabels)
{
+ int ret = -1;
char *bindHost = NULL;
char *bindService = NULL;
char *connectHost = NULL;
@@ -10819,7 +10820,6 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def,
char *append = NULL;
char *haveTLS = NULL;
char *tlsFromConfig = NULL;
- int remaining = 0;
while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE) {
@@ -10912,8 +10912,6 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def,
} else if (virXMLNodeNameEqual(cur, "protocol")) {
if (!protocol)
protocol = virXMLPropString(cur, "type");
- } else {
- remaining++;
}
}
cur = cur->next;
@@ -11099,6 +11097,7 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def,
goto error;
}
+ ret = 0;
cleanup:
VIR_FREE(mode);
VIR_FREE(protocol);
@@ -11114,11 +11113,10 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def,
VIR_FREE(haveTLS);
VIR_FREE(tlsFromConfig);
- return remaining;
+ return ret;
error:
virDomainChrSourceDefClear(def);
- remaining = -1;
goto cleanup;
}
@@ -13895,7 +13893,6 @@ virDomainRedirdevDefParseXML(virDomainXMLOptionPtr xmlopt,
xmlNodePtr cur;
virDomainRedirdevDefPtr def;
char *bus = NULL, *type = NULL;
- int remaining;
if (VIR_ALLOC(def) < 0)
return NULL;
@@ -13929,11 +13926,9 @@ virDomainRedirdevDefParseXML(virDomainXMLOptionPtr xmlopt,
cur = node->children;
/* boot gets parsed in virDomainDeviceInfoParseXML
- * source gets parsed in virDomainChrSourceDefParseXML
- * we don't know any of the elements that might remain */
- remaining = virDomainChrSourceDefParseXML(def->source, cur, flags,
- NULL, NULL, NULL, 0);
- if (remaining < 0)
+ * source gets parsed in virDomainChrSourceDefParseXML */
+ if (virDomainChrSourceDefParseXML(def->source, cur, flags,
+ NULL, NULL, NULL, 0) < 0)
goto error;
if (def->source->type == VIR_DOMAIN_CHR_TYPE_SPICEVMC)
--
2.13.5
7:32 a.m.
New subject: [libvirt] [PATCH 4/8] conf: use virXMLPropString for KeyWrapCipherDef parsing
XPath is good for random search of elements, not for accessing
attributes of one node.
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
src/conf/domain_conf.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 528d11c17d..9dc788e9f9 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -933,7 +933,6 @@ virDomainXMLOptionClassDispose(void *obj)
*
* @def Domain definition
* @node An XML cipher node
- * @ctxt The XML context
*
* Parse the attributes from the cipher node and store the state
* attribute in @def.
@@ -947,8 +946,7 @@ virDomainXMLOptionClassDispose(void *obj)
*/
static int
virDomainKeyWrapCipherDefParseXML(virDomainKeyWrapDefPtr keywrap,
- xmlNodePtr node,
- xmlXPathContextPtr ctxt)
+ xmlNodePtr node)
{
char *name = NULL;
@@ -956,10 +954,8 @@ virDomainKeyWrapCipherDefParseXML(virDomainKeyWrapDefPtr keywrap,
int state_type;
int name_type;
int ret = -1;
- xmlNodePtr oldnode = ctxt->node;
- ctxt->node = node;
- if (!(name = virXPathString("string(./@name)", ctxt))) {
+ if (!(name = virXMLPropString(node, "name"))) {
virReportError(VIR_ERR_CONF_SYNTAX, "%s",
_("missing name for cipher"));
goto cleanup;
@@ -971,7 +967,7 @@ virDomainKeyWrapCipherDefParseXML(virDomainKeyWrapDefPtr keywrap,
goto cleanup;
}
- if (!(state = virXPathString("string(./@state)", ctxt))) {
+ if (!(state = virXMLPropString(node, "state"))) {
virReportError(VIR_ERR_CONF_SYNTAX,
_("missing state for cipher named %s"), name);
goto cleanup;
@@ -1017,7 +1013,6 @@ virDomainKeyWrapCipherDefParseXML(virDomainKeyWrapDefPtr keywrap,
cleanup:
VIR_FREE(name);
VIR_FREE(state);
- ctxt->node = oldnode;
return ret;
}
@@ -1036,7 +1031,7 @@ virDomainKeyWrapDefParseXML(virDomainDefPtr def, xmlXPathContextPtr
ctxt)
goto cleanup;
for (i = 0; i < n; i++) {
- if (virDomainKeyWrapCipherDefParseXML(def->keywrap, nodes[i], ctxt) < 0)
+ if (virDomainKeyWrapCipherDefParseXML(def->keywrap, nodes[i]) < 0)
goto cleanup;
}
--
2.13.5
7:32 a.m.
New subject: [libvirt] [PATCH 5/8] conf: use virXMLPropString for disk geometry parsing
XPath is good for random search of elements, not for accessing
attributes of one node.
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
src/conf/domain_conf.c | 59 ++++++++++++++++++++++++++++----------------------
1 file changed, 33 insertions(+), 26 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 9dc788e9f9..cb1b5b55fb 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -8029,46 +8029,53 @@ virDomainDiskDefMirrorParse(virDomainDiskDefPtr def,
static int
virDomainDiskDefGeometryParse(virDomainDiskDefPtr def,
- xmlNodePtr cur,
- xmlXPathContextPtr ctxt)
+ xmlNodePtr cur)
{
- char *trans;
+ char *tmp;
- if (virXPathUInt("string(./geometry/@cyls)",
- ctxt, &def->geometry.cylinders) < 0) {
- virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("invalid geometry settings (cyls)"));
- return -1;
+ if ((tmp = virXMLPropString(cur, "cyls"))) {
+ if (virStrToLong_ui(tmp, NULL, 10, &def->geometry.cylinders) < 0) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("invalid geometry settings (cyls)"));
+ goto error;
+ }
+ VIR_FREE(tmp);
}
- if (virXPathUInt("string(./geometry/@heads)",
- ctxt, &def->geometry.heads) < 0) {
- virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("invalid geometry settings (heads)"));
- return -1;
+ if ((tmp = virXMLPropString(cur, "heads"))) {
+ if (virStrToLong_ui(tmp, NULL, 10, &def->geometry.heads) < 0) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("invalid geometry settings (heads)"));
+ goto error;
+ }
+ VIR_FREE(tmp);
}
- if (virXPathUInt("string(./geometry/@secs)",
- ctxt, &def->geometry.sectors) < 0) {
- virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("invalid geometry settings (secs)"));
- return -1;
+ if ((tmp = virXMLPropString(cur, "secs"))) {
+ if (virStrToLong_ui(tmp, NULL, 10, &def->geometry.sectors) < 0) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("invalid geometry settings (secs)"));
+ goto error;
+ }
+ VIR_FREE(tmp);
}
- trans = virXMLPropString(cur, "trans");
- if (trans) {
- def->geometry.trans = virDomainDiskGeometryTransTypeFromString(trans);
+ if ((tmp = virXMLPropString(cur, "trans"))) {
+ def->geometry.trans = virDomainDiskGeometryTransTypeFromString(tmp);
if (def->geometry.trans <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("invalid translation value '%s'"),
- trans);
- VIR_FREE(trans);
- return -1;
+ tmp);
+ goto error;
}
- VIR_FREE(trans);
+ VIR_FREE(tmp);
}
return 0;
+
+ error:
+ VIR_FREE(tmp);
+ return -1;
}
@@ -8374,7 +8381,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
virXMLNodeNameEqual(cur, "backenddomain")) {
domain_name = virXMLPropString(cur, "name");
} else if (virXMLNodeNameEqual(cur, "geometry")) {
- if (virDomainDiskDefGeometryParse(def, cur, ctxt) < 0)
+ if (virDomainDiskDefGeometryParse(def, cur) < 0)
goto error;
} else if (virXMLNodeNameEqual(cur, "blockio")) {
logical_block_size =
--
2.13.5
7:32 a.m.
New subject: [libvirt] [PATCH 6/8] conf: use virXMLPropString for IOThread parsing
XPath is good for random search of elements, not for accessing
attributes of one node.
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
src/conf/domain_conf.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index cb1b5b55fb..6e424c96d8 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -16209,19 +16209,15 @@ virDomainIdmapDefParseXML(xmlXPathContextPtr ctxt,
* </iothreadids>
*/
static virDomainIOThreadIDDefPtr
-virDomainIOThreadIDDefParseXML(xmlNodePtr node,
- xmlXPathContextPtr ctxt)
+virDomainIOThreadIDDefParseXML(xmlNodePtr node)
{
virDomainIOThreadIDDefPtr iothrid;
- xmlNodePtr oldnode = ctxt->node;
char *tmp = NULL;
if (VIR_ALLOC(iothrid) < 0)
return NULL;
- ctxt->node = node;
-
- if (!(tmp = virXPathString("string(./@id)", ctxt))) {
+ if (!(tmp = virXMLPropString(node, "id"))) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("Missing 'id' attribute in <iothread>
element"));
goto error;
@@ -16235,7 +16231,6 @@ virDomainIOThreadIDDefParseXML(xmlNodePtr node,
cleanup:
VIR_FREE(tmp);
- ctxt->node = oldnode;
return iothrid;
error:
@@ -16275,7 +16270,7 @@ virDomainDefParseIOThreads(virDomainDefPtr def,
for (i = 0; i < n; i++) {
virDomainIOThreadIDDefPtr iothrid = NULL;
- if (!(iothrid = virDomainIOThreadIDDefParseXML(nodes[i], ctxt)))
+ if (!(iothrid = virDomainIOThreadIDDefParseXML(nodes[i])))
goto error;
if (virDomainIOThreadIDFind(def, iothrid->iothread_id)) {
--
2.13.5
7:32 a.m.
New subject: [libvirt] [PATCH 7/8] conf: use virXMLPropString for IOThread pin parsing
XPath is good for random search of elements, not for accessing
attributes of one node.
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
src/conf/domain_conf.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 6e424c96d8..23ef46dc79 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -16362,19 +16362,15 @@ virDomainVcpuPinDefParseXML(virDomainDefPtr def,
*/
static int
virDomainIOThreadPinDefParseXML(xmlNodePtr node,
- xmlXPathContextPtr ctxt,
virDomainDefPtr def)
{
int ret = -1;
virDomainIOThreadIDDefPtr iothrid;
virBitmapPtr cpumask = NULL;
- xmlNodePtr oldnode = ctxt->node;
unsigned int iothreadid;
char *tmp = NULL;
- ctxt->node = node;
-
- if (!(tmp = virXPathString("string(./@iothread)", ctxt))) {
+ if (!(tmp = virXMLPropString(node, "iothread"))) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("missing iothread id in iothreadpin"));
goto cleanup;
@@ -16430,7 +16426,6 @@ virDomainIOThreadPinDefParseXML(xmlNodePtr node,
cleanup:
VIR_FREE(tmp);
virBitmapFree(cpumask);
- ctxt->node = oldnode;
return ret;
}
@@ -17705,7 +17700,7 @@ virDomainDefParseXML(xmlDocPtr xml,
}
for (i = 0; i < n; i++) {
- if (virDomainIOThreadPinDefParseXML(nodes[i], ctxt, def) < 0)
+ if (virDomainIOThreadPinDefParseXML(nodes[i], def) < 0)
goto error;
}
VIR_FREE(nodes);
--
2.13.5
7:32 a.m.
New subject: [libvirt] [PATCH 8/8] conf: use virXMLPropString for Domain def parsing
XPath is good for random search of elements, not for accessing
attributes of one node.
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
src/conf/domain_conf.c | 46 +++++++++++++---------------------------------
1 file changed, 13 insertions(+), 33 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 23ef46dc79..281dc68f0e 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -17140,7 +17140,7 @@ virDomainDefParseBootOptions(virDomainDefPtr def,
if (n == 1) {
oldnode = ctxt->node;
ctxt->node = nodes[0];
- tmp = virXPathString("string(./@type)", ctxt);
+ tmp = virXMLPropString(nodes[0], "type");
if (!tmp) {
virReportError(VIR_ERR_XML_ERROR, "%s",
@@ -17221,7 +17221,7 @@ virDomainDefParseXML(xmlDocPtr xml,
def->id = (int)id;
/* Find out what type of virtualization to use */
- if (!(tmp = virXPathString("string(./@type)", ctxt))) {
+ if (!(tmp = virXMLPropString(ctxt->node, "type"))) {
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("missing domain type attribute"));
goto error;
@@ -17812,9 +17812,7 @@ virDomainDefParseXML(xmlDocPtr xml,
break;
case VIR_DOMAIN_FEATURE_CAPABILITIES:
- node = ctxt->node;
- ctxt->node = nodes[i];
- if ((tmp = virXPathString("string(./@policy)", ctxt))) {
+ if ((tmp = virXMLPropString(nodes[i], "policy"))) {
if ((def->features[val] =
virDomainCapabilitiesPolicyTypeFromString(tmp)) == -1) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown state attribute '%s' of
feature '%s'"),
@@ -17825,7 +17823,6 @@ virDomainDefParseXML(xmlDocPtr xml,
} else {
def->features[val] = VIR_TRISTATE_SWITCH_ABSENT;
}
- ctxt->node = node;
break;
case VIR_DOMAIN_FEATURE_HAP:
@@ -17833,9 +17830,7 @@ virDomainDefParseXML(xmlDocPtr xml,
case VIR_DOMAIN_FEATURE_PVSPINLOCK:
case VIR_DOMAIN_FEATURE_VMPORT:
case VIR_DOMAIN_FEATURE_SMM:
- node = ctxt->node;
- ctxt->node = nodes[i];
- if ((tmp = virXPathString("string(./@state)", ctxt))) {
+ if ((tmp = virXMLPropString(nodes[i], "state"))) {
if ((def->features[val] = virTristateSwitchTypeFromString(tmp)) == -1)
{
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown state attribute '%s' of
feature '%s'"),
@@ -17846,13 +17841,10 @@ virDomainDefParseXML(xmlDocPtr xml,
} else {
def->features[val] = VIR_TRISTATE_SWITCH_ON;
}
- ctxt->node = node;
break;
case VIR_DOMAIN_FEATURE_GIC:
- node = ctxt->node;
- ctxt->node = nodes[i];
- if ((tmp = virXPathString("string(./@version)", ctxt))) {
+ if ((tmp = virXMLPropString(nodes[i], "version"))) {
gic_version = virGICVersionTypeFromString(tmp);
if (gic_version < 0 || gic_version == VIR_GIC_VERSION_NONE) {
virReportError(VIR_ERR_XML_ERROR,
@@ -17863,13 +17855,10 @@ virDomainDefParseXML(xmlDocPtr xml,
VIR_FREE(tmp);
}
def->features[val] = VIR_TRISTATE_SWITCH_ON;
- ctxt->node = node;
break;
case VIR_DOMAIN_FEATURE_IOAPIC:
- node = ctxt->node;
- ctxt->node = nodes[i];
- tmp = virXPathString("string(./@driver)", ctxt);
+ tmp = virXMLPropString(nodes[i], "driver");
if (tmp) {
int value = virDomainIOAPICTypeFromString(tmp);
if (value < 0) {
@@ -17882,7 +17871,6 @@ virDomainDefParseXML(xmlDocPtr xml,
def->features[val] = VIR_TRISTATE_SWITCH_ON;
VIR_FREE(tmp);
}
- ctxt->node = node;
break;
/* coverity[dead_error_begin] */
@@ -17910,7 +17898,7 @@ virDomainDefParseXML(xmlDocPtr xml,
ctxt->node = nodes[i];
- if (!(tmp = virXPathString("string(./@state)", ctxt))) {
+ if (!(tmp = virXMLPropString(nodes[i], "state"))) {
virReportError(VIR_ERR_XML_ERROR,
_("missing 'state' attribute for "
"HyperV Enlightenment feature '%s'"),
@@ -17962,8 +17950,8 @@ virDomainDefParseXML(xmlDocPtr xml,
if (value != VIR_TRISTATE_SWITCH_ON)
break;
- if (!(def->hyperv_vendor_id =
virXPathString("string(./@value)",
- ctxt))) {
+ if (!(def->hyperv_vendor_id = virXMLPropString(nodes[i],
+ "value"))) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("missing 'value' attribute for "
"HyperV feature 'vendor_id'"));
@@ -17997,7 +17985,6 @@ virDomainDefParseXML(xmlDocPtr xml,
if (def->features[VIR_DOMAIN_FEATURE_KVM] == VIR_TRISTATE_SWITCH_ON) {
int feature;
int value;
- node = ctxt->node;
if ((n = virXPathNodeSet("./features/kvm/*", ctxt, &nodes)) <
0)
goto error;
@@ -18010,11 +17997,9 @@ virDomainDefParseXML(xmlDocPtr xml,
goto error;
}
- ctxt->node = nodes[i];
-
switch ((virDomainKVM) feature) {
case VIR_DOMAIN_KVM_HIDDEN:
- if (!(tmp = virXPathString("string(./@state)", ctxt))) {
+ if (!(tmp = virXMLPropString(nodes[i], "state"))) {
virReportError(VIR_ERR_XML_ERROR,
_("missing 'state' attribute for
"
"KVM feature '%s'"),
@@ -18040,7 +18025,6 @@ virDomainDefParseXML(xmlDocPtr xml,
}
}
VIR_FREE(nodes);
- ctxt->node = node;
}
if ((n = virXPathNodeSet("./features/capabilities/*", ctxt, &nodes))
< 0)
@@ -18055,10 +18039,7 @@ virDomainDefParseXML(xmlDocPtr xml,
}
if (val >= 0 && val < VIR_DOMAIN_CAPS_FEATURE_LAST) {
- node = ctxt->node;
- ctxt->node = nodes[i];
-
- if ((tmp = virXPathString("string(./@state)", ctxt))) {
+ if ((tmp = virXMLPropString(nodes[i], "state"))) {
if ((def->caps_features[val] = virTristateSwitchTypeFromString(tmp))
== -1) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown state attribute '%s' of
feature capability '%s'"),
@@ -18069,7 +18050,6 @@ virDomainDefParseXML(xmlDocPtr xml,
} else {
def->caps_features[val] = VIR_TRISTATE_SWITCH_ON;
}
- ctxt->node = node;
}
}
VIR_FREE(nodes);
@@ -18914,7 +18894,7 @@ virDomainObjParseXML(xmlDocPtr xml,
if (!obj->def)
goto error;
- if (!(tmp = virXPathString("string(./@state)", ctxt))) {
+ if (!(tmp = virXMLPropString(ctxt->node, "state"))) {
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("missing domain state"));
goto error;
@@ -18927,7 +18907,7 @@ virDomainObjParseXML(xmlDocPtr xml,
}
VIR_FREE(tmp);
- if ((tmp = virXPathString("string(./@reason)", ctxt))) {
+ if ((tmp = virXMLPropString(ctxt->node, "reason"))) {
if ((reason = virDomainStateReasonFromString(state, tmp)) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("invalid domain state reason '%s'"),
tmp);
--
2.13.5
10:10 a.m.
On Mon, Aug 14, 2017 at 02:32:39PM +0200, Pavel Hrdina wrote:
Pavel Hrdina (8):
util: introduce virXMLNodeNameEqual
use virXMLNodeNameEqual instead of xmlStrEqual
conf: cleanup virDomainChrSourceDef parsing
conf: use virXMLPropString for KeyWrapCipherDef parsing
FYI there is a non-breaking space after conf:
conf: use virXMLPropString for disk geometry parsing
conf: use virXMLPropString for IOThread parsing
conf: use virXMLPropString for IOThread pin parsing
conf: use virXMLPropString for Domain def parsing
ACK series.
Jan
11:30 a.m.
On Mon, Aug 14, 2017 at 05:10:00PM +0200, Ján Tomko wrote:
On Mon, Aug 14, 2017 at 02:32:39PM +0200, Pavel Hrdina wrote:
> Pavel Hrdina (8):
> util: introduce virXMLNodeNameEqual
> use virXMLNodeNameEqual instead of xmlStrEqual
> conf: cleanup virDomainChrSourceDef parsing
> conf: use virXMLPropString for KeyWrapCipherDef parsing
FYI there is a non-breaking space after conf:
And I was wondering why git was asking about encoding.
I've fixed it and pushed it, thanks.
Pavel
2687
days inactive
2687
days old
10 comments
2 participants
participants (2)
-
Ján Tomko -
Pavel Hrdina