External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

use virXMLNodeNameEqual instead of xmlStrEqual

Browse Source 
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2017-08-14 14:31:52 +02:00
parent 5bd8a1c5d8
commit 068606f85c
20 changed files with 152 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/conf/cpu_conf.c
View File

@ -280,7 +280,7 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt,
goto cleanup; goto cleanup;
} }
if (!xmlStrEqual(ctxt->node->name, BAD_CAST "cpu")) { if (!virXMLNodeNameEqual(ctxt->node, "cpu")) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("XML does not contain expected 'cpu' element")); _("XML does not contain expected 'cpu' element"));
goto cleanup; goto cleanup;

212
src/conf/domain_conf.c
View File

@ -1202,9 +1202,9 @@ virDomainBlkioDeviceParseXML(xmlNodePtr root,
node = root->children; node = root->children;
while (node) { while (node) {
if (node->type == XML_ELEMENT_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); dev->path = (char *)xmlNodeGetContent(node);
} else if (xmlStrEqual(node->name, BAD_CAST "weight")) { } else if (virXMLNodeNameEqual(node, "weight")) {
c = (char *)xmlNodeGetContent(node); c = (char *)xmlNodeGetContent(node);
if (virStrToLong_ui(c, NULL, 10, &dev->weight) < 0) { if (virStrToLong_ui(c, NULL, 10, &dev->weight) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
@ -1213,7 +1213,7 @@ virDomainBlkioDeviceParseXML(xmlNodePtr root,
goto error; goto error;
} }
VIR_FREE(c); VIR_FREE(c);
} else if (xmlStrEqual(node->name, BAD_CAST "read_bytes_sec")) { } else if (virXMLNodeNameEqual(node, "read_bytes_sec")) {
c = (char *)xmlNodeGetContent(node); c = (char *)xmlNodeGetContent(node);
if (virStrToLong_ull(c, NULL, 10, &dev->rbps) < 0) { if (virStrToLong_ull(c, NULL, 10, &dev->rbps) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
@ -1222,7 +1222,7 @@ virDomainBlkioDeviceParseXML(xmlNodePtr root,
goto error; goto error;
} }
VIR_FREE(c); VIR_FREE(c);
} else if (xmlStrEqual(node->name, BAD_CAST "write_bytes_sec")) { } else if (virXMLNodeNameEqual(node, "write_bytes_sec")) {
c = (char *)xmlNodeGetContent(node); c = (char *)xmlNodeGetContent(node);
if (virStrToLong_ull(c, NULL, 10, &dev->wbps) < 0) { if (virStrToLong_ull(c, NULL, 10, &dev->wbps) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
@ -1231,7 +1231,7 @@ virDomainBlkioDeviceParseXML(xmlNodePtr root,
goto error; goto error;
} }
VIR_FREE(c); VIR_FREE(c);
} else if (xmlStrEqual(node->name, BAD_CAST "read_iops_sec")) { } else if (virXMLNodeNameEqual(node, "read_iops_sec")) {
c = (char *)xmlNodeGetContent(node); c = (char *)xmlNodeGetContent(node);
if (virStrToLong_ui(c, NULL, 10, &dev->riops) < 0) { if (virStrToLong_ui(c, NULL, 10, &dev->riops) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
@ -1240,7 +1240,7 @@ virDomainBlkioDeviceParseXML(xmlNodePtr root,
goto error; goto error;
} }
VIR_FREE(c); VIR_FREE(c);
} else if (xmlStrEqual(node->name, BAD_CAST "write_iops_sec")) { } else if (virXMLNodeNameEqual(node, "write_iops_sec")) {
c = (char *)xmlNodeGetContent(node); c = (char *)xmlNodeGetContent(node);
if (virStrToLong_ui(c, NULL, 10, &dev->wiops) < 0) { if (virStrToLong_ui(c, NULL, 10, &dev->wiops) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
@ -5913,21 +5913,21 @@ virDomainDeviceInfoParseXML(xmlNodePtr node,
if (cur->type == XML_ELEMENT_NODE) { if (cur->type == XML_ELEMENT_NODE) {
if (alias == NULL && if (alias == NULL &&
!(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE) && !(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE) &&
xmlStrEqual(cur->name, BAD_CAST "alias")) { virXMLNodeNameEqual(cur, "alias")) {
alias = cur; alias = cur;
} else if (address == NULL && } else if (address == NULL &&
xmlStrEqual(cur->name, BAD_CAST "address")) { virXMLNodeNameEqual(cur, "address")) {
address = cur; address = cur;
} else if (master == NULL && } else if (master == NULL &&
xmlStrEqual(cur->name, BAD_CAST "master")) { virXMLNodeNameEqual(cur, "master")) {
master = cur; master = cur;
} else if (boot == NULL && } else if (boot == NULL &&
(flags & VIR_DOMAIN_DEF_PARSE_ALLOW_BOOT) && (flags & VIR_DOMAIN_DEF_PARSE_ALLOW_BOOT) &&
xmlStrEqual(cur->name, BAD_CAST "boot")) { virXMLNodeNameEqual(cur, "boot")) {
boot = cur; boot = cur;
} else if (rom == NULL && } else if (rom == NULL &&
(flags & VIR_DOMAIN_DEF_PARSE_ALLOW_ROM) && (flags & VIR_DOMAIN_DEF_PARSE_ALLOW_ROM) &&
xmlStrEqual(cur->name, BAD_CAST "rom")) { virXMLNodeNameEqual(cur, "rom")) {
rom = cur; rom = cur;
} }
} }
@ -6105,7 +6105,7 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node,
cur = node->children; cur = node->children;
while (cur != NULL) { while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE) { if (cur->type == XML_ELEMENT_NODE) {
if (xmlStrEqual(cur->name, BAD_CAST "vendor")) { if (virXMLNodeNameEqual(cur, "vendor")) {
char *vendor = virXMLPropString(cur, "id"); char *vendor = virXMLPropString(cur, "id");
if (vendor) { if (vendor) {
@ -6122,7 +6122,7 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node,
"%s", _("usb vendor needs id")); "%s", _("usb vendor needs id"));
goto out; goto out;
} }
} else if (xmlStrEqual(cur->name, BAD_CAST "product")) { } else if (virXMLNodeNameEqual(cur, "product")) {
char* product = virXMLPropString(cur, "id"); char* product = virXMLPropString(cur, "id");
if (product) { if (product) {
@ -6141,7 +6141,7 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node,
"%s", _("usb product needs id")); "%s", _("usb product needs id"));
goto out; goto out;
} }
} else if (xmlStrEqual(cur->name, BAD_CAST "address")) { } else if (virXMLNodeNameEqual(cur, "address")) {
char *bus, *device; char *bus, *device;
bus = virXMLPropString(cur, "bus"); bus = virXMLPropString(cur, "bus");
@ -6223,11 +6223,11 @@ virDomainHostdevSubsysPCIOrigStatesDefParseXML(xmlNodePtr node,
while (cur != NULL) { while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE) { if (cur->type == XML_ELEMENT_NODE) {
if (xmlStrEqual(cur->name, BAD_CAST "unbind")) { if (virXMLNodeNameEqual(cur, "unbind")) {
def->states.pci.unbind_from_stub = true; 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; def->states.pci.remove_slot = true;
} else if (xmlStrEqual(cur->name, BAD_CAST "reprobe")) { } else if (virXMLNodeNameEqual(cur, "reprobe")) {
def->states.pci.reprobe = true; def->states.pci.reprobe = true;
} else { } else {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
@ -6253,14 +6253,14 @@ virDomainHostdevSubsysPCIDefParseXML(xmlNodePtr node,
cur = node->children; cur = node->children;
while (cur != NULL) { while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE) { if (cur->type == XML_ELEMENT_NODE) {
if (xmlStrEqual(cur->name, BAD_CAST "address")) { if (virXMLNodeNameEqual(cur, "address")) {
virPCIDeviceAddressPtr addr = virPCIDeviceAddressPtr addr =
&def->source.subsys.u.pci.addr; &def->source.subsys.u.pci.addr;
if (virPCIDeviceAddressParseXML(cur, addr) < 0) if (virPCIDeviceAddressParseXML(cur, addr) < 0)
goto out; goto out;
} else if ((flags & VIR_DOMAIN_DEF_PARSE_STATUS) && } 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 */ /* Legacy back-compat. Don't add any more attributes here */
char *devaddr = virXMLPropString(cur, "devaddr"); char *devaddr = virXMLPropString(cur, "devaddr");
if (devaddr && if (devaddr &&
@ -6274,7 +6274,7 @@ virDomainHostdevSubsysPCIDefParseXML(xmlNodePtr node,
} }
def->info->type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; def->info->type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI;
} else if ((flags & VIR_DOMAIN_DEF_PARSE_PCI_ORIG_STATES) && } else if ((flags & VIR_DOMAIN_DEF_PARSE_PCI_ORIG_STATES) &&
xmlStrEqual(cur->name, BAD_CAST "origstates")) { virXMLNodeNameEqual(cur, "origstates")) {
virDomainHostdevOrigStatesPtr states = &def->origstates; virDomainHostdevOrigStatesPtr states = &def->origstates;
if (virDomainHostdevSubsysPCIOrigStatesDefParseXML(cur, states) < 0) if (virDomainHostdevSubsysPCIOrigStatesDefParseXML(cur, states) < 0)
goto out; goto out;
@ -6371,7 +6371,7 @@ virDomainStorageNetworkParseHosts(xmlNodePtr node,
for (child = node->children; child; child = child->next) { for (child = node->children; child; child = child->next) {
if (child->type == XML_ELEMENT_NODE && if (child->type == XML_ELEMENT_NODE &&
xmlStrEqual(child->name, BAD_CAST "host")) { virXMLNodeNameEqual(child, "host")) {
if (virDomainStorageNetworkParseHost(child, hosts, nhosts) < 0) if (virDomainStorageNetworkParseHost(child, hosts, nhosts) < 0)
return -1; return -1;
@ -6395,7 +6395,7 @@ virDomainHostdevSubsysSCSIHostDefParseXML(xmlNodePtr sourcenode,
cur = sourcenode->children; cur = sourcenode->children;
while (cur != NULL) { while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE) { if (cur->type == XML_ELEMENT_NODE) {
if (xmlStrEqual(cur->name, BAD_CAST "address")) { if (virXMLNodeNameEqual(cur, "address")) {
if (got_address) { if (got_address) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("more than one source addresses is " _("more than one source addresses is "
@ -6432,7 +6432,7 @@ virDomainHostdevSubsysSCSIHostDefParseXML(xmlNodePtr sourcenode,
} }
got_address = true; got_address = true;
} else if (xmlStrEqual(cur->name, BAD_CAST "adapter")) { } else if (virXMLNodeNameEqual(cur, "adapter")) {
if (got_adapter) { if (got_adapter) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("more than one adapters is specified " _("more than one adapters is specified "
@ -6508,7 +6508,7 @@ virDomainHostdevSubsysSCSIiSCSIDefParseXML(xmlNodePtr sourcenode,
cur = sourcenode->children; cur = sourcenode->children;
while (cur != NULL) { while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE && if (cur->type == XML_ELEMENT_NODE &&
xmlStrEqual(cur->name, BAD_CAST "auth")) { virXMLNodeNameEqual(cur, "auth")) {
if (!(authdef = virStorageAuthDefParse(sourcenode->doc, cur))) if (!(authdef = virStorageAuthDefParse(sourcenode->doc, cur)))
goto cleanup; goto cleanup;
if ((auth_secret_usage = if ((auth_secret_usage =
@ -7591,13 +7591,13 @@ virDomainLeaseDefParseXML(xmlNodePtr node)
cur = node->children; cur = node->children;
while (cur != NULL) { while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE) { if (cur->type == XML_ELEMENT_NODE) {
if (!key && xmlStrEqual(cur->name, BAD_CAST "key")) { if (!key && virXMLNodeNameEqual(cur, "key")) {
key = (char *)xmlNodeGetContent(cur); key = (char *)xmlNodeGetContent(cur);
} else if (!lockspace && } else if (!lockspace &&
xmlStrEqual(cur->name, BAD_CAST "lockspace")) { virXMLNodeNameEqual(cur, "lockspace")) {
lockspace = (char *)xmlNodeGetContent(cur); lockspace = (char *)xmlNodeGetContent(cur);
} else if (!path && } else if (!path &&
xmlStrEqual(cur->name, BAD_CAST "target")) { virXMLNodeNameEqual(cur, "target")) {
path = virXMLPropString(cur, "path"); path = virXMLPropString(cur, "path");
offset = virXMLPropString(cur, "offset"); offset = virXMLPropString(cur, "offset");
} }
@ -8346,7 +8346,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
if (cur->type != XML_ELEMENT_NODE) if (cur->type != XML_ELEMENT_NODE)
continue; continue;
if (!source && xmlStrEqual(cur->name, BAD_CAST "source")) { if (!source && virXMLNodeNameEqual(cur, "source")) {
sourceNode = cur; sourceNode = cur;
if (virDomainDiskSourceParse(cur, ctxt, def->src) < 0) if (virDomainDiskSourceParse(cur, ctxt, def->src) < 0)
@ -8364,7 +8364,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
startupPolicy = virXMLPropString(cur, "startupPolicy"); startupPolicy = virXMLPropString(cur, "startupPolicy");
} else if (!target && } else if (!target &&
xmlStrEqual(cur->name, BAD_CAST "target")) { virXMLNodeNameEqual(cur, "target")) {
target = virXMLPropString(cur, "dev"); target = virXMLPropString(cur, "dev");
bus = virXMLPropString(cur, "bus"); bus = virXMLPropString(cur, "bus");
tray = virXMLPropString(cur, "tray"); tray = virXMLPropString(cur, "tray");
@ -8376,12 +8376,12 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
STRPREFIX(target, "ioemu:")) STRPREFIX(target, "ioemu:"))
memmove(target, target+6, strlen(target)-5); memmove(target, target+6, strlen(target)-5);
} else if (!domain_name && } else if (!domain_name &&
xmlStrEqual(cur->name, BAD_CAST "backenddomain")) { virXMLNodeNameEqual(cur, "backenddomain")) {
domain_name = virXMLPropString(cur, "name"); domain_name = virXMLPropString(cur, "name");
} else if (xmlStrEqual(cur->name, BAD_CAST "geometry")) { } else if (virXMLNodeNameEqual(cur, "geometry")) {
if (virDomainDiskDefGeometryParse(def, cur, ctxt) < 0) if (virDomainDiskDefGeometryParse(def, cur, ctxt) < 0)
goto error; goto error;
} else if (xmlStrEqual(cur->name, BAD_CAST "blockio")) { } else if (virXMLNodeNameEqual(cur, "blockio")) {
logical_block_size = logical_block_size =
virXMLPropString(cur, "logical_block_size"); virXMLPropString(cur, "logical_block_size");
if (logical_block_size && if (logical_block_size &&
@ -8403,16 +8403,16 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
goto error; goto error;
} }
} else if (!def->src->driverName && } else if (!def->src->driverName &&
xmlStrEqual(cur->name, BAD_CAST "driver")) { virXMLNodeNameEqual(cur, "driver")) {
if (virDomainDiskDefDriverParseXML(def, cur) < 0) if (virDomainDiskDefDriverParseXML(def, cur) < 0)
goto error; goto error;
} else if (!def->mirror && } else if (!def->mirror &&
xmlStrEqual(cur->name, BAD_CAST "mirror") && virXMLNodeNameEqual(cur, "mirror") &&
!(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE)) { !(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE)) {
if (virDomainDiskDefMirrorParse(def, cur, ctxt) < 0) if (virDomainDiskDefMirrorParse(def, cur, ctxt) < 0)
goto error; goto error;
} else if (!authdef && } else if (!authdef &&
xmlStrEqual(cur->name, BAD_CAST "auth")) { virXMLNodeNameEqual(cur, "auth")) {
if (!(authdef = virStorageAuthDefParse(node->doc, cur))) if (!(authdef = virStorageAuthDefParse(node->doc, cur)))
goto error; goto error;
/* Disk volume types won't have the secrettype filled in until /* Disk volume types won't have the secrettype filled in until
@ -8426,36 +8426,36 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
authdef->secrettype); authdef->secrettype);
goto error; goto error;
} }
} else if (xmlStrEqual(cur->name, BAD_CAST "iotune")) { } else if (virXMLNodeNameEqual(cur, "iotune")) {
if (virDomainDiskDefIotuneParse(def, ctxt) < 0) if (virDomainDiskDefIotuneParse(def, ctxt) < 0)
goto error; goto error;
} else if (xmlStrEqual(cur->name, BAD_CAST "readonly")) { } else if (virXMLNodeNameEqual(cur, "readonly")) {
def->src->readonly = true; def->src->readonly = true;
} else if (xmlStrEqual(cur->name, BAD_CAST "shareable")) { } else if (virXMLNodeNameEqual(cur, "shareable")) {
def->src->shared = true; def->src->shared = true;
} else if (xmlStrEqual(cur->name, BAD_CAST "transient")) { } else if (virXMLNodeNameEqual(cur, "transient")) {
def->transient = true; def->transient = true;
} else if ((flags & VIR_DOMAIN_DEF_PARSE_STATUS) && } 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 */ /* Legacy back-compat. Don't add any more attributes here */
devaddr = virXMLPropString(cur, "devaddr"); devaddr = virXMLPropString(cur, "devaddr");
} else if (encryption == NULL && } else if (encryption == NULL &&
xmlStrEqual(cur->name, BAD_CAST "encryption")) { virXMLNodeNameEqual(cur, "encryption")) {
encryption = virStorageEncryptionParseNode(node->doc, encryption = virStorageEncryptionParseNode(node->doc,
cur); cur);
if (encryption == NULL) if (encryption == NULL)
goto error; goto error;
} else if (!serial && } else if (!serial &&
xmlStrEqual(cur->name, BAD_CAST "serial")) { virXMLNodeNameEqual(cur, "serial")) {
serial = (char *)xmlNodeGetContent(cur); serial = (char *)xmlNodeGetContent(cur);
} else if (!wwn && } else if (!wwn &&
xmlStrEqual(cur->name, BAD_CAST "wwn")) { virXMLNodeNameEqual(cur, "wwn")) {
wwn = (char *)xmlNodeGetContent(cur); wwn = (char *)xmlNodeGetContent(cur);
if (!virValidateWWN(wwn)) if (!virValidateWWN(wwn))
goto error; goto error;
} else if (!vendor && } else if (!vendor &&
xmlStrEqual(cur->name, BAD_CAST "vendor")) { virXMLNodeNameEqual(cur, "vendor")) {
vendor = (char *)xmlNodeGetContent(cur); vendor = (char *)xmlNodeGetContent(cur);
if (strlen(vendor) > VENDOR_LEN) { if (strlen(vendor) > VENDOR_LEN) {
@ -8470,7 +8470,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
goto error; goto error;
} }
} else if (!product && } else if (!product &&
xmlStrEqual(cur->name, BAD_CAST "product")) { virXMLNodeNameEqual(cur, "product")) {
product = (char *)xmlNodeGetContent(cur); product = (char *)xmlNodeGetContent(cur);
if (strlen(product) > PRODUCT_LEN) { if (strlen(product) > PRODUCT_LEN) {
@ -8484,7 +8484,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
_("disk product is not printable string")); _("disk product is not printable string"));
goto error; goto error;
} }
} else if (xmlStrEqual(cur->name, BAD_CAST "boot")) { } else if (virXMLNodeNameEqual(cur, "boot")) {
/* boot is parsed as part of virDomainDeviceInfoParseXML */ /* boot is parsed as part of virDomainDeviceInfoParseXML */
} }
} }
@ -9070,13 +9070,13 @@ virDomainControllerDefParseXML(xmlNodePtr node,
cur = node->children; cur = node->children;
while (cur != NULL) { while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE) { if (cur->type == XML_ELEMENT_NODE) {
if (xmlStrEqual(cur->name, BAD_CAST "driver")) { if (virXMLNodeNameEqual(cur, "driver")) {
queues = virXMLPropString(cur, "queues"); queues = virXMLPropString(cur, "queues");
cmd_per_lun = virXMLPropString(cur, "cmd_per_lun"); cmd_per_lun = virXMLPropString(cur, "cmd_per_lun");
max_sectors = virXMLPropString(cur, "max_sectors"); max_sectors = virXMLPropString(cur, "max_sectors");
ioeventfd = virXMLPropString(cur, "ioeventfd"); ioeventfd = virXMLPropString(cur, "ioeventfd");
iothread = virXMLPropString(cur, "iothread"); iothread = virXMLPropString(cur, "iothread");
} else if (xmlStrEqual(cur->name, BAD_CAST "model")) { } else if (virXMLNodeNameEqual(cur, "model")) {
if (processedModel) { if (processedModel) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("Multiple <model> elements in " _("Multiple <model> elements in "
@ -9085,7 +9085,7 @@ virDomainControllerDefParseXML(xmlNodePtr node,
} }
modelName = virXMLPropString(cur, "name"); modelName = virXMLPropString(cur, "name");
processedModel = true; processedModel = true;
} else if (xmlStrEqual(cur->name, BAD_CAST "target")) { } else if (virXMLNodeNameEqual(cur, "target")) {
if (processedTarget) { if (processedTarget) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("Multiple <target> elements in " _("Multiple <target> elements in "
@ -9450,7 +9450,7 @@ virDomainFSDefParseXML(xmlNodePtr node,
while (cur != NULL) { while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE) { if (cur->type == XML_ELEMENT_NODE) {
if (!source && if (!source &&
xmlStrEqual(cur->name, BAD_CAST "source")) { virXMLNodeNameEqual(cur, "source")) {
if (def->type == VIR_DOMAIN_FS_TYPE_MOUNT || if (def->type == VIR_DOMAIN_FS_TYPE_MOUNT ||
def->type == VIR_DOMAIN_FS_TYPE_BIND) { def->type == VIR_DOMAIN_FS_TYPE_BIND) {
@ -9470,11 +9470,11 @@ virDomainFSDefParseXML(xmlNodePtr node,
goto error; goto error;
} }
} else if (!target && } else if (!target &&
xmlStrEqual(cur->name, BAD_CAST "target")) { virXMLNodeNameEqual(cur, "target")) {
target = virXMLPropString(cur, "dir"); target = virXMLPropString(cur, "dir");
} else if (xmlStrEqual(cur->name, BAD_CAST "readonly")) { } else if (virXMLNodeNameEqual(cur, "readonly")) {
def->readonly = true; def->readonly = true;
} else if (xmlStrEqual(cur->name, BAD_CAST "driver")) { } else if (virXMLNodeNameEqual(cur, "driver")) {
if (!fsdriver) if (!fsdriver)
fsdriver = virXMLPropString(cur, "type"); fsdriver = virXMLPropString(cur, "type");
if (!wrpolicy) if (!wrpolicy)
@ -9857,7 +9857,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
cur = node->children; cur = node->children;
while (cur != NULL) { while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE) { if (cur->type == XML_ELEMENT_NODE) {
if (xmlStrEqual(cur->name, BAD_CAST "source")) { if (virXMLNodeNameEqual(cur, "source")) {
xmlNodePtr tmpnode = ctxt->node; xmlNodePtr tmpnode = ctxt->node;
ctxt->node = cur; ctxt->node = cur;
@ -9866,27 +9866,27 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
goto error; goto error;
ctxt->node = tmpnode; ctxt->node = tmpnode;
} }
if (!macaddr && xmlStrEqual(cur->name, BAD_CAST "mac")) { if (!macaddr && virXMLNodeNameEqual(cur, "mac")) {
macaddr = virXMLPropString(cur, "address"); macaddr = virXMLPropString(cur, "address");
} else if (!network && } else if (!network &&
def->type == VIR_DOMAIN_NET_TYPE_NETWORK && def->type == VIR_DOMAIN_NET_TYPE_NETWORK &&
xmlStrEqual(cur->name, BAD_CAST "source")) { virXMLNodeNameEqual(cur, "source")) {
network = virXMLPropString(cur, "network"); network = virXMLPropString(cur, "network");
portgroup = virXMLPropString(cur, "portgroup"); portgroup = virXMLPropString(cur, "portgroup");
} else if (!internal && } else if (!internal &&
def->type == VIR_DOMAIN_NET_TYPE_INTERNAL && def->type == VIR_DOMAIN_NET_TYPE_INTERNAL &&
xmlStrEqual(cur->name, BAD_CAST "source")) { virXMLNodeNameEqual(cur, "source")) {
internal = virXMLPropString(cur, "name"); internal = virXMLPropString(cur, "name");
} else if (!bridge && } else if (!bridge &&
def->type == VIR_DOMAIN_NET_TYPE_BRIDGE && def->type == VIR_DOMAIN_NET_TYPE_BRIDGE &&
xmlStrEqual(cur->name, BAD_CAST "source")) { virXMLNodeNameEqual(cur, "source")) {
bridge = virXMLPropString(cur, "bridge"); bridge = virXMLPropString(cur, "bridge");
} else if (!dev && def->type == VIR_DOMAIN_NET_TYPE_DIRECT && } else if (!dev && def->type == VIR_DOMAIN_NET_TYPE_DIRECT &&
xmlStrEqual(cur->name, BAD_CAST "source")) { virXMLNodeNameEqual(cur, "source")) {
dev = virXMLPropString(cur, "dev"); dev = virXMLPropString(cur, "dev");
mode = virXMLPropString(cur, "mode"); mode = virXMLPropString(cur, "mode");
} else if (!dev && def->type == VIR_DOMAIN_NET_TYPE_ETHERNET && } 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 /* This clause is only necessary because from 2010 to
* 2016 it was possible (but never documented) to * 2016 it was possible (but never documented) to
* configure the name of the guest-side interface of * configure the name of the guest-side interface of
@ -9908,12 +9908,12 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
} }
} else if (!vhostuser_path && !vhostuser_mode && !vhostuser_type } else if (!vhostuser_path && !vhostuser_mode && !vhostuser_type
&& def->type == VIR_DOMAIN_NET_TYPE_VHOSTUSER && && def->type == VIR_DOMAIN_NET_TYPE_VHOSTUSER &&
xmlStrEqual(cur->name, BAD_CAST "source")) { virXMLNodeNameEqual(cur, "source")) {
vhostuser_type = virXMLPropString(cur, "type"); vhostuser_type = virXMLPropString(cur, "type");
vhostuser_path = virXMLPropString(cur, "path"); vhostuser_path = virXMLPropString(cur, "path");
vhostuser_mode = virXMLPropString(cur, "mode"); vhostuser_mode = virXMLPropString(cur, "mode");
} else if (!def->virtPortProfile } else if (!def->virtPortProfile
&& xmlStrEqual(cur->name, BAD_CAST "virtualport")) { && virXMLNodeNameEqual(cur, "virtualport")) {
if (def->type == VIR_DOMAIN_NET_TYPE_NETWORK) { if (def->type == VIR_DOMAIN_NET_TYPE_NETWORK) {
if (!(def->virtPortProfile if (!(def->virtPortProfile
= virNetDevVPortProfileParse(cur, = virNetDevVPortProfileParse(cur,
@ -9941,7 +9941,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
def->type == VIR_DOMAIN_NET_TYPE_CLIENT || def->type == VIR_DOMAIN_NET_TYPE_CLIENT ||
def->type == VIR_DOMAIN_NET_TYPE_MCAST || def->type == VIR_DOMAIN_NET_TYPE_MCAST ||
def->type == VIR_DOMAIN_NET_TYPE_UDP) && def->type == VIR_DOMAIN_NET_TYPE_UDP) &&
xmlStrEqual(cur->name, BAD_CAST "source")) { virXMLNodeNameEqual(cur, "source")) {
address = virXMLPropString(cur, "address"); address = virXMLPropString(cur, "address");
port = virXMLPropString(cur, "port"); port = virXMLPropString(cur, "port");
if (!localaddr && def->type == VIR_DOMAIN_NET_TYPE_UDP) { if (!localaddr && def->type == VIR_DOMAIN_NET_TYPE_UDP) {
@ -9952,7 +9952,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
ctxt->node = tmpnode; ctxt->node = tmpnode;
} }
} else if (!ifname && } else if (!ifname &&
xmlStrEqual(cur->name, BAD_CAST "target")) { virXMLNodeNameEqual(cur, "target")) {
ifname = virXMLPropString(cur, "dev"); ifname = virXMLPropString(cur, "dev");
if (ifname && if (ifname &&
(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE) && (flags & VIR_DOMAIN_DEF_PARSE_INACTIVE) &&
@ -9962,21 +9962,21 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
VIR_FREE(ifname); VIR_FREE(ifname);
} }
} else if ((!ifname_guest || !ifname_guest_actual) && } else if ((!ifname_guest || !ifname_guest_actual) &&
xmlStrEqual(cur->name, BAD_CAST "guest")) { virXMLNodeNameEqual(cur, "guest")) {
ifname_guest = virXMLPropString(cur, "dev"); ifname_guest = virXMLPropString(cur, "dev");
ifname_guest_actual = virXMLPropString(cur, "actual"); ifname_guest_actual = virXMLPropString(cur, "actual");
} else if (!linkstate && } else if (!linkstate &&
xmlStrEqual(cur->name, BAD_CAST "link")) { virXMLNodeNameEqual(cur, "link")) {
linkstate = virXMLPropString(cur, "state"); linkstate = virXMLPropString(cur, "state");
} else if (!script && } else if (!script &&
xmlStrEqual(cur->name, BAD_CAST "script")) { virXMLNodeNameEqual(cur, "script")) {
script = virXMLPropString(cur, "path"); script = virXMLPropString(cur, "path");
} else if (!domain_name && } else if (!domain_name &&
xmlStrEqual(cur->name, BAD_CAST "backenddomain")) { virXMLNodeNameEqual(cur, "backenddomain")) {
domain_name = virXMLPropString(cur, "name"); domain_name = virXMLPropString(cur, "name");
} else if (xmlStrEqual(cur->name, BAD_CAST "model")) { } else if (virXMLNodeNameEqual(cur, "model")) {
model = virXMLPropString(cur, "type"); model = virXMLPropString(cur, "type");
} else if (xmlStrEqual(cur->name, BAD_CAST "driver")) { } else if (virXMLNodeNameEqual(cur, "driver")) {
backend = virXMLPropString(cur, "name"); backend = virXMLPropString(cur, "name");
txmode = virXMLPropString(cur, "txmode"); txmode = virXMLPropString(cur, "txmode");
ioeventfd = virXMLPropString(cur, "ioeventfd"); ioeventfd = virXMLPropString(cur, "ioeventfd");
@ -9984,7 +9984,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
queues = virXMLPropString(cur, "queues"); queues = virXMLPropString(cur, "queues");
rx_queue_size = virXMLPropString(cur, "rx_queue_size"); rx_queue_size = virXMLPropString(cur, "rx_queue_size");
tx_queue_size = virXMLPropString(cur, "tx_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) { if (filter) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("Invalid specification of multiple <filterref>s " _("Invalid specification of multiple <filterref>s "
@ -9995,28 +9995,28 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
virNWFilterHashTableFree(filterparams); virNWFilterHashTableFree(filterparams);
filterparams = virNWFilterParseParamAttributes(cur); filterparams = virNWFilterParseParamAttributes(cur);
} else if ((flags & VIR_DOMAIN_DEF_PARSE_STATUS) && } 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 */ /* Legacy back-compat. Don't add any more attributes here */
devaddr = virXMLPropString(cur, "devaddr"); devaddr = virXMLPropString(cur, "devaddr");
} else if (xmlStrEqual(cur->name, BAD_CAST "boot")) { } else if (virXMLNodeNameEqual(cur, "boot")) {
/* boot is parsed as part of virDomainDeviceInfoParseXML */ /* boot is parsed as part of virDomainDeviceInfoParseXML */
} else if (!actual && } else if (!actual &&
(flags & VIR_DOMAIN_DEF_PARSE_ACTUAL_NET) && (flags & VIR_DOMAIN_DEF_PARSE_ACTUAL_NET) &&
def->type == VIR_DOMAIN_NET_TYPE_NETWORK && def->type == VIR_DOMAIN_NET_TYPE_NETWORK &&
xmlStrEqual(cur->name, BAD_CAST "actual")) { virXMLNodeNameEqual(cur, "actual")) {
if (virDomainActualNetDefParseXML(cur, ctxt, def, if (virDomainActualNetDefParseXML(cur, ctxt, def,
&actual, flags) < 0) { &actual, flags) < 0) {
goto error; goto error;
} }
} else if (xmlStrEqual(cur->name, BAD_CAST "bandwidth")) { } else if (virXMLNodeNameEqual(cur, "bandwidth")) {
if (virNetDevBandwidthParse(&def->bandwidth, if (virNetDevBandwidthParse(&def->bandwidth,
cur, cur,
def->type) < 0) def->type) < 0)
goto error; goto error;
} else if (xmlStrEqual(cur->name, BAD_CAST "vlan")) { } else if (virXMLNodeNameEqual(cur, "vlan")) {
if (virNetDevVlanParse(cur, ctxt, &def->vlan) < 0) if (virNetDevVlanParse(cur, ctxt, &def->vlan) < 0)
goto error; goto error;
} else if (xmlStrEqual(cur->name, BAD_CAST "backend")) { } else if (virXMLNodeNameEqual(cur, "backend")) {
char *tmp = NULL; char *tmp = NULL;
if ((tmp = virXMLPropString(cur, "tap"))) if ((tmp = virXMLPropString(cur, "tap")))
@ -10823,7 +10823,7 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def,
while (cur != NULL) { while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE) { if (cur->type == XML_ELEMENT_NODE) {
if (xmlStrEqual(cur->name, BAD_CAST "source")) { if (virXMLNodeNameEqual(cur, "source")) {
if (!mode) if (!mode)
mode = virXMLPropString(cur, "mode"); mode = virXMLPropString(cur, "mode");
if (!haveTLS) if (!haveTLS)
@ -10904,12 +10904,12 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def,
} }
ctxt->node = saved_node; ctxt->node = saved_node;
} }
} else if (xmlStrEqual(cur->name, BAD_CAST "log")) { } else if (virXMLNodeNameEqual(cur, "log")) {
if (!logfile) if (!logfile)
logfile = virXMLPropString(cur, "file"); logfile = virXMLPropString(cur, "file");
if (!logappend) if (!logappend)
logappend = virXMLPropString(cur, "append"); logappend = virXMLPropString(cur, "append");
} else if (xmlStrEqual(cur->name, BAD_CAST "protocol")) { } else if (virXMLNodeNameEqual(cur, "protocol")) {
if (!protocol) if (!protocol)
protocol = virXMLPropString(cur, "type"); protocol = virXMLPropString(cur, "type");
} else { } else {
@ -11239,7 +11239,7 @@ virDomainChrDefParseXML(virDomainXMLOptionPtr xmlopt,
cur = node->children; cur = node->children;
while (cur != NULL) { while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE) { if (cur->type == XML_ELEMENT_NODE) {
if (xmlStrEqual(cur->name, BAD_CAST "target")) { if (virXMLNodeNameEqual(cur, "target")) {
seenTarget = true; seenTarget = true;
if (virDomainChrDefParseTargetXML(def, cur, flags) < 0) if (virDomainChrDefParseTargetXML(def, cur, flags) < 0)
goto error; goto error;
@ -11331,7 +11331,7 @@ virDomainSmartcardDefParseXML(virDomainXMLOptionPtr xmlopt,
cur = node->children; cur = node->children;
while (cur) { while (cur) {
if (cur->type == XML_ELEMENT_NODE && if (cur->type == XML_ELEMENT_NODE &&
xmlStrEqual(cur->name, BAD_CAST "certificate")) { virXMLNodeNameEqual(cur, "certificate")) {
if (i == 3) { if (i == 3) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("host-certificates mode needs " _("host-certificates mode needs "
@ -11345,7 +11345,7 @@ virDomainSmartcardDefParseXML(virDomainXMLOptionPtr xmlopt,
} }
i++; i++;
} else if (cur->type == XML_ELEMENT_NODE && } else if (cur->type == XML_ELEMENT_NODE &&
xmlStrEqual(cur->name, BAD_CAST "database") && virXMLNodeNameEqual(cur, "database") &&
!def->data.cert.database) { !def->data.cert.database) {
def->data.cert.database = (char *)xmlNodeGetContent(cur); def->data.cert.database = (char *)xmlNodeGetContent(cur);
if (!def->data.cert.database) { if (!def->data.cert.database) {
@ -12477,7 +12477,7 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
cur = node->children; cur = node->children;
while (cur != NULL) { while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE) { if (cur->type == XML_ELEMENT_NODE) {
if (xmlStrEqual(cur->name, BAD_CAST "channel")) { if (virXMLNodeNameEqual(cur, "channel")) {
char *name, *mode; char *name, *mode;
int nameval, modeval; int nameval, modeval;
name = virXMLPropString(cur, "name"); name = virXMLPropString(cur, "name");
@ -12511,7 +12511,7 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
VIR_FREE(mode); VIR_FREE(mode);
def->data.spice.channels[nameval] = modeval; def->data.spice.channels[nameval] = modeval;
} else if (xmlStrEqual(cur->name, BAD_CAST "image")) { } else if (virXMLNodeNameEqual(cur, "image")) {
char *compression = virXMLPropString(cur, "compression"); char *compression = virXMLPropString(cur, "compression");
int compressionVal; int compressionVal;
@ -12532,7 +12532,7 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
VIR_FREE(compression); VIR_FREE(compression);
def->data.spice.image = compressionVal; def->data.spice.image = compressionVal;
} else if (xmlStrEqual(cur->name, BAD_CAST "jpeg")) { } else if (virXMLNodeNameEqual(cur, "jpeg")) {
char *compression = virXMLPropString(cur, "compression"); char *compression = virXMLPropString(cur, "compression");
int compressionVal; int compressionVal;
@ -12553,7 +12553,7 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
VIR_FREE(compression); VIR_FREE(compression);
def->data.spice.jpeg = compressionVal; def->data.spice.jpeg = compressionVal;
} else if (xmlStrEqual(cur->name, BAD_CAST "zlib")) { } else if (virXMLNodeNameEqual(cur, "zlib")) {
char *compression = virXMLPropString(cur, "compression"); char *compression = virXMLPropString(cur, "compression");
int compressionVal; int compressionVal;
@ -12574,7 +12574,7 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
VIR_FREE(compression); VIR_FREE(compression);
def->data.spice.zlib = compressionVal; def->data.spice.zlib = compressionVal;
} else if (xmlStrEqual(cur->name, BAD_CAST "playback")) { } else if (virXMLNodeNameEqual(cur, "playback")) {
char *compression = virXMLPropString(cur, "compression"); char *compression = virXMLPropString(cur, "compression");
int compressionVal; int compressionVal;
@ -12595,7 +12595,7 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
VIR_FREE(compression); VIR_FREE(compression);
def->data.spice.playback = compressionVal; def->data.spice.playback = compressionVal;
} else if (xmlStrEqual(cur->name, BAD_CAST "streaming")) { } else if (virXMLNodeNameEqual(cur, "streaming")) {
char *mode = virXMLPropString(cur, "mode"); char *mode = virXMLPropString(cur, "mode");
int modeVal; int modeVal;
@ -12615,7 +12615,7 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
VIR_FREE(mode); VIR_FREE(mode);
def->data.spice.streaming = modeVal; def->data.spice.streaming = modeVal;
} else if (xmlStrEqual(cur->name, BAD_CAST "clipboard")) { } else if (virXMLNodeNameEqual(cur, "clipboard")) {
char *copypaste = virXMLPropString(cur, "copypaste"); char *copypaste = virXMLPropString(cur, "copypaste");
int copypasteVal; int copypasteVal;
@ -12635,7 +12635,7 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
VIR_FREE(copypaste); VIR_FREE(copypaste);
def->data.spice.copypaste = copypasteVal; def->data.spice.copypaste = copypasteVal;
} else if (xmlStrEqual(cur->name, BAD_CAST "filetransfer")) { } else if (virXMLNodeNameEqual(cur, "filetransfer")) {
char *enable = virXMLPropString(cur, "enable"); char *enable = virXMLPropString(cur, "enable");
int enableVal; int enableVal;
@ -12655,7 +12655,7 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
VIR_FREE(enable); VIR_FREE(enable);
def->data.spice.filetransfer = enableVal; def->data.spice.filetransfer = enableVal;
} else if (xmlStrEqual(cur->name, BAD_CAST "gl")) { } else if (virXMLNodeNameEqual(cur, "gl")) {
char *enable = virXMLPropString(cur, "enable"); char *enable = virXMLPropString(cur, "enable");
char *rendernode = virXMLPropString(cur, "rendernode"); char *rendernode = virXMLPropString(cur, "rendernode");
int enableVal; int enableVal;
@ -12680,7 +12680,7 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
def->data.spice.gl = enableVal; def->data.spice.gl = enableVal;
def->data.spice.rendernode = rendernode; def->data.spice.rendernode = rendernode;
} else if (xmlStrEqual(cur->name, BAD_CAST "mouse")) { } else if (virXMLNodeNameEqual(cur, "mouse")) {
char *mode = virXMLPropString(cur, "mode"); char *mode = virXMLPropString(cur, "mode");
int modeVal; int modeVal;
@ -13237,7 +13237,7 @@ virSysinfoBIOSParseXML(xmlNodePtr node,
int ret = -1; int ret = -1;
virSysinfoBIOSDefPtr def; virSysinfoBIOSDefPtr def;
if (!xmlStrEqual(node->name, BAD_CAST "bios")) { if (!virXMLNodeNameEqual(node, "bios")) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("XML does not contain expected 'bios' element")); _("XML does not contain expected 'bios' element"));
return ret; return ret;
@ -13299,7 +13299,7 @@ virSysinfoSystemParseXML(xmlNodePtr node,
virSysinfoSystemDefPtr def; virSysinfoSystemDefPtr def;
char *tmpUUID = NULL; char *tmpUUID = NULL;
if (!xmlStrEqual(node->name, BAD_CAST "system")) { if (!virXMLNodeNameEqual(node, "system")) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("XML does not contain expected 'system' element")); _("XML does not contain expected 'system' element"));
return ret; return ret;
@ -13427,7 +13427,7 @@ virSysinfoParseXML(xmlNodePtr node,
xmlNodePtr oldnode, tmpnode; xmlNodePtr oldnode, tmpnode;
char *type; char *type;
if (!xmlStrEqual(node->name, BAD_CAST "sysinfo")) { if (!virXMLNodeNameEqual(node, "sysinfo")) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("XML does not contain expected 'sysinfo' element")); _("XML does not contain expected 'sysinfo' element"));
return NULL; return NULL;
@ -13564,7 +13564,7 @@ virDomainVideoAccelDefParseXML(xmlNodePtr node)
while (cur != NULL) { while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE) { if (cur->type == XML_ELEMENT_NODE) {
if (!accel3d && !accel2d && if (!accel3d && !accel2d &&
xmlStrEqual(cur->name, BAD_CAST "acceleration")) { virXMLNodeNameEqual(cur, "acceleration")) {
accel3d = virXMLPropString(cur, "accel3d"); accel3d = virXMLPropString(cur, "accel3d");
accel2d = virXMLPropString(cur, "accel2d"); accel2d = virXMLPropString(cur, "accel2d");
} }
@ -13614,7 +13614,7 @@ virDomainVideoDriverDefParseXML(xmlNodePtr node)
while (cur != NULL) { while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE) { if (cur->type == XML_ELEMENT_NODE) {
if (!vgaconf && if (!vgaconf &&
xmlStrEqual(cur->name, BAD_CAST "driver")) { virXMLNodeNameEqual(cur, "driver")) {
vgaconf = virXMLPropString(cur, "vgaconf"); vgaconf = virXMLPropString(cur, "vgaconf");
} }
} }
@ -13665,7 +13665,7 @@ virDomainVideoDefParseXML(xmlNodePtr node,
while (cur != NULL) { while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE) { if (cur->type == XML_ELEMENT_NODE) {
if (!type && !vram && !ram && !heads && if (!type && !vram && !ram && !heads &&
xmlStrEqual(cur->name, BAD_CAST "model")) { virXMLNodeNameEqual(cur, "model")) {
type = virXMLPropString(cur, "type"); type = virXMLPropString(cur, "type");
ram = virXMLPropString(cur, "ram"); ram = virXMLPropString(cur, "ram");
vram = virXMLPropString(cur, "vram"); vram = virXMLPropString(cur, "vram");
@ -14516,10 +14516,10 @@ virDomainDeviceDefParse(const char *xmlStr,
if ((dev->type = virDomainDeviceTypeFromString((const char *) node->name)) < 0) { if ((dev->type = virDomainDeviceTypeFromString((const char *) node->name)) < 0) {
/* Some crazy mapping of serial, parallel, console and channel to /* Some crazy mapping of serial, parallel, console and channel to
* VIR_DOMAIN_DEVICE_CHR. */ * VIR_DOMAIN_DEVICE_CHR. */
if (xmlStrEqual(node->name, BAD_CAST "channel") || if (virXMLNodeNameEqual(node, "channel") ||
xmlStrEqual(node->name, BAD_CAST "console") || virXMLNodeNameEqual(node, "console") ||
xmlStrEqual(node->name, BAD_CAST "parallel") || virXMLNodeNameEqual(node, "parallel") ||
xmlStrEqual(node->name, BAD_CAST "serial")) { virXMLNodeNameEqual(node, "serial")) {
dev->type = VIR_DOMAIN_DEVICE_CHR; dev->type = VIR_DOMAIN_DEVICE_CHR;
} else { } else {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
@ -14681,7 +14681,7 @@ virDomainDiskDefSourceParse(const char *xmlStr,
goto cleanup; goto cleanup;
node = ctxt->node; node = ctxt->node;
if (!xmlStrEqual(node->name, BAD_CAST "disk")) { if (!virXMLNodeNameEqual(node, "disk")) {
virReportError(VIR_ERR_XML_ERROR, virReportError(VIR_ERR_XML_ERROR,
_("expecting root element of 'disk', not '%s'"), _("expecting root element of 'disk', not '%s'"),
node->name); node->name);
@ -19044,7 +19044,7 @@ virDomainDefParseNode(xmlDocPtr xml,
xmlXPathContextPtr ctxt = NULL; xmlXPathContextPtr ctxt = NULL;
virDomainDefPtr def = NULL; virDomainDefPtr def = NULL;
if (!xmlStrEqual(root->name, BAD_CAST "domain")) { if (!virXMLNodeNameEqual(root, "domain")) {
virReportError(VIR_ERR_XML_ERROR, virReportError(VIR_ERR_XML_ERROR,
_("unexpected root element <%s>, " _("unexpected root element <%s>, "
"expecting <domain>"), "expecting <domain>"),
@ -19077,7 +19077,7 @@ virDomainObjParseNode(xmlDocPtr xml,
xmlXPathContextPtr ctxt = NULL; xmlXPathContextPtr ctxt = NULL;
virDomainObjPtr obj = NULL; virDomainObjPtr obj = NULL;
if (!xmlStrEqual(root->name, BAD_CAST "domstatus")) { if (!virXMLNodeNameEqual(root, "domstatus")) {
virReportError(VIR_ERR_XML_ERROR, virReportError(VIR_ERR_XML_ERROR,
_("unexpected root element <%s>, " _("unexpected root element <%s>, "
"expecting <domstatus>"), "expecting <domstatus>"),

2
src/conf/interface_conf.c
View File

@ -824,7 +824,7 @@ virInterfaceDefParseNode(xmlDocPtr xml,
xmlXPathContextPtr ctxt = NULL; xmlXPathContextPtr ctxt = NULL;
virInterfaceDefPtr def = NULL; virInterfaceDefPtr def = NULL;
if (!xmlStrEqual(root->name, BAD_CAST "interface")) { if (!virXMLNodeNameEqual(root, "interface")) {
virReportError(VIR_ERR_XML_ERROR, virReportError(VIR_ERR_XML_ERROR,
_("unexpected root element <%s>, " _("unexpected root element <%s>, "
"expecting <interface>"), "expecting <interface>"),

6
src/conf/netdev_bandwidth_conf.c
View File

@ -125,7 +125,7 @@ virNetDevBandwidthParse(virNetDevBandwidthPtr *bandwidth,
if (VIR_ALLOC(def) < 0) if (VIR_ALLOC(def) < 0)
return ret; return ret;
if (!node || !xmlStrEqual(node->name, BAD_CAST "bandwidth")) { if (!node || !virXMLNodeNameEqual(node, "bandwidth")) {
virReportError(VIR_ERR_INVALID_ARG, "%s", virReportError(VIR_ERR_INVALID_ARG, "%s",
_("invalid argument supplied")); _("invalid argument supplied"));
goto cleanup; goto cleanup;
@ -135,7 +135,7 @@ virNetDevBandwidthParse(virNetDevBandwidthPtr *bandwidth,
while (cur) { while (cur) {
if (cur->type == XML_ELEMENT_NODE) { if (cur->type == XML_ELEMENT_NODE) {
if (xmlStrEqual(cur->name, BAD_CAST "inbound")) { if (virXMLNodeNameEqual(cur, "inbound")) {
if (in) { if (in) {
virReportError(VIR_ERR_XML_DETAIL, "%s", virReportError(VIR_ERR_XML_DETAIL, "%s",
_("Only one child <inbound> " _("Only one child <inbound> "
@ -143,7 +143,7 @@ virNetDevBandwidthParse(virNetDevBandwidthPtr *bandwidth,
goto cleanup; goto cleanup;
} }
in = cur; in = cur;
} else if (xmlStrEqual(cur->name, BAD_CAST "outbound")) { } else if (virXMLNodeNameEqual(cur, "outbound")) {
if (out) { if (out) {
virReportError(VIR_ERR_XML_DETAIL, "%s", virReportError(VIR_ERR_XML_DETAIL, "%s",
_("Only one child <outbound> " _("Only one child <outbound> "

2
src/conf/netdev_vport_profile_conf.c
View File

@ -61,7 +61,7 @@ virNetDevVPortProfileParse(xmlNodePtr node, unsigned int flags)
} }
while (cur != NULL) { while (cur != NULL) {
if (xmlStrEqual(cur->name, BAD_CAST "parameters")) { if (virXMLNodeNameEqual(cur, "parameters")) {
virtPortManagerID = virXMLPropString(cur, "managerid"); virtPortManagerID = virXMLPropString(cur, "managerid");
virtPortTypeID = virXMLPropString(cur, "typeid"); virtPortTypeID = virXMLPropString(cur, "typeid");
virtPortTypeIDVersion = virXMLPropString(cur, "typeidversion"); virtPortTypeIDVersion = virXMLPropString(cur, "typeidversion");

12
src/conf/network_conf.c
View File

@ -529,7 +529,7 @@ virNetworkDHCPDefParseXML(const char *networkName,
cur = node->children; cur = node->children;
while (cur != NULL) { while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE && if (cur->type == XML_ELEMENT_NODE &&
xmlStrEqual(cur->name, BAD_CAST "range")) { virXMLNodeNameEqual(cur, "range")) {
if (virSocketAddrRangeParseXML(networkName, def, cur, &range) < 0) if (virSocketAddrRangeParseXML(networkName, def, cur, &range) < 0)
goto cleanup; goto cleanup;
@ -537,7 +537,7 @@ virNetworkDHCPDefParseXML(const char *networkName,
goto cleanup; goto cleanup;
} else if (cur->type == XML_ELEMENT_NODE && } else if (cur->type == XML_ELEMENT_NODE &&
xmlStrEqual(cur->name, BAD_CAST "host")) { virXMLNodeNameEqual(cur, "host")) {
if (virNetworkDHCPHostDefParseXML(networkName, def, cur, if (virNetworkDHCPHostDefParseXML(networkName, def, cur,
&host, false) < 0) &host, false) < 0)
@ -547,7 +547,7 @@ virNetworkDHCPDefParseXML(const char *networkName,
} else if (VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_INET) && } else if (VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_INET) &&
cur->type == XML_ELEMENT_NODE && cur->type == XML_ELEMENT_NODE &&
xmlStrEqual(cur->name, BAD_CAST "bootp")) { virXMLNodeNameEqual(cur, "bootp")) {
char *file; char *file;
char *server; char *server;
virSocketAddr inaddr; virSocketAddr inaddr;
@ -609,7 +609,7 @@ virNetworkDNSHostDefParseXML(const char *networkName,
cur = node->children; cur = node->children;
while (cur != NULL) { while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE && if (cur->type == XML_ELEMENT_NODE &&
xmlStrEqual(cur->name, BAD_CAST "hostname")) { virXMLNodeNameEqual(cur, "hostname")) {
if (cur->children != NULL) { if (cur->children != NULL) {
char *name = (char *) xmlNodeGetContent(cur); char *name = (char *) xmlNodeGetContent(cur);
@ -2034,7 +2034,7 @@ virNetworkDefParseNode(xmlDocPtr xml,
xmlXPathContextPtr ctxt = NULL; xmlXPathContextPtr ctxt = NULL;
virNetworkDefPtr def = NULL; virNetworkDefPtr def = NULL;
if (!xmlStrEqual(root->name, BAD_CAST "network")) { if (!virXMLNodeNameEqual(root, "network")) {
virReportError(VIR_ERR_XML_ERROR, virReportError(VIR_ERR_XML_ERROR,
_("unexpected root element <%s>, " _("unexpected root element <%s>, "
"expecting <network>"), "expecting <network>"),
@ -2702,7 +2702,7 @@ virNetworkDefUpdateCheckElementName(virNetworkDefPtr def,
xmlNodePtr node, xmlNodePtr node,
const char *section) const char *section)
{ {
if (!xmlStrEqual(node->name, BAD_CAST section)) { if (!virXMLNodeNameEqual(node, section)) {
virReportError(VIR_ERR_XML_ERROR, virReportError(VIR_ERR_XML_ERROR,
_("unexpected element <%s>, expecting <%s>, " _("unexpected element <%s>, expecting <%s>, "
"while updating network '%s'"), "while updating network '%s'"),

2
src/conf/node_device_conf.c
View File

@ -2047,7 +2047,7 @@ virNodeDeviceDefParseNode(xmlDocPtr xml,
xmlXPathContextPtr ctxt = NULL; xmlXPathContextPtr ctxt = NULL;
virNodeDeviceDefPtr def = NULL; virNodeDeviceDefPtr def = NULL;
if (!xmlStrEqual(root->name, BAD_CAST "device")) { if (!virXMLNodeNameEqual(root, "device")) {
virReportError(VIR_ERR_XML_ERROR, virReportError(VIR_ERR_XML_ERROR,
_("unexpected root element <%s> " _("unexpected root element <%s> "
"expecting <device>"), "expecting <device>"),

6
src/conf/nwfilter_conf.c
View File

@ -2452,7 +2452,7 @@ virNWFilterRuleParse(xmlNodePtr node)
if (found) if (found)
i = found_i; i = found_i;
if (xmlStrEqual(cur->name, BAD_CAST virAttr[i].id)) { if (virXMLNodeNameEqual(cur, virAttr[i].id)) {
found_i = i; found_i = i;
found = true; found = true;
@ -2668,12 +2668,12 @@ virNWFilterDefParseXML(xmlXPathContextPtr ctxt)
if (VIR_ALLOC(entry) < 0) if (VIR_ALLOC(entry) < 0)
goto cleanup; goto cleanup;
if (xmlStrEqual(curr->name, BAD_CAST "rule")) { if (virXMLNodeNameEqual(curr, "rule")) {
if (!(entry->rule = virNWFilterRuleParse(curr))) { if (!(entry->rule = virNWFilterRuleParse(curr))) {
virNWFilterEntryFree(entry); virNWFilterEntryFree(entry);
goto cleanup; goto cleanup;
} }
} else if (xmlStrEqual(curr->name, BAD_CAST "filterref")) { } else if (virXMLNodeNameEqual(curr, "filterref")) {
if (!(entry->include = virNWFilterIncludeParse(curr))) { if (!(entry->include = virNWFilterIncludeParse(curr))) {
virNWFilterEntryFree(entry); virNWFilterEntryFree(entry);
goto cleanup; goto cleanup;

2
src/conf/nwfilter_params.c
View File

@ -810,7 +810,7 @@ virNWFilterParseParamAttributes(xmlNodePtr cur)
while (cur != NULL) { while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE) { if (cur->type == XML_ELEMENT_NODE) {
if (xmlStrEqual(cur->name, BAD_CAST "parameter")) { if (virXMLNodeNameEqual(cur, "parameter")) {
nam = virXMLPropString(cur, "name"); nam = virXMLPropString(cur, "name");
val = virXMLPropString(cur, "value"); val = virXMLPropString(cur, "value");
value = NULL; value = NULL;

2
src/conf/secret_conf.c
View File

@ -131,7 +131,7 @@ secretXMLParseNode(xmlDocPtr xml, xmlNodePtr root)
char *prop = NULL; char *prop = NULL;
char *uuidstr = NULL; char *uuidstr = NULL;
if (!xmlStrEqual(root->name, BAD_CAST "secret")) { if (!virXMLNodeNameEqual(root, "secret")) {
virReportError(VIR_ERR_XML_ERROR, virReportError(VIR_ERR_XML_ERROR,
_("unexpected root element <%s>, " _("unexpected root element <%s>, "
"expecting <secret>"), "expecting <secret>"),

2
src/conf/snapshot_conf.c
View File

@ -394,7 +394,7 @@ virDomainSnapshotDefParseNode(xmlDocPtr xml,
xmlXPathContextPtr ctxt = NULL; xmlXPathContextPtr ctxt = NULL;
virDomainSnapshotDefPtr def = NULL; virDomainSnapshotDefPtr def = NULL;
if (!xmlStrEqual(root->name, BAD_CAST "domainsnapshot")) { if (!virXMLNodeNameEqual(root, "domainsnapshot")) {
virReportError(VIR_ERR_XML_ERROR, "%s", _("domainsnapshot")); virReportError(VIR_ERR_XML_ERROR, "%s", _("domainsnapshot"));
goto cleanup; goto cleanup;
} }

4
src/conf/storage_conf.c
View File

@ -823,7 +823,7 @@ virStoragePoolDefParseNode(xmlDocPtr xml,
xmlXPathContextPtr ctxt = NULL; xmlXPathContextPtr ctxt = NULL;
virStoragePoolDefPtr def = NULL; virStoragePoolDefPtr def = NULL;
if (!xmlStrEqual(root->name, BAD_CAST "pool")) { if (!virXMLNodeNameEqual(root, "pool")) {
virReportError(VIR_ERR_XML_ERROR, virReportError(VIR_ERR_XML_ERROR,
_("unexpected root element <%s>, " _("unexpected root element <%s>, "
"expecting <pool>"), "expecting <pool>"),
@ -1267,7 +1267,7 @@ virStorageVolDefParseNode(virStoragePoolDefPtr pool,
xmlXPathContextPtr ctxt = NULL; xmlXPathContextPtr ctxt = NULL;
virStorageVolDefPtr def = NULL; virStorageVolDefPtr def = NULL;
if (!xmlStrEqual(root->name, BAD_CAST "volume")) { if (!virXMLNodeNameEqual(root, "volume")) {
virReportError(VIR_ERR_XML_ERROR, virReportError(VIR_ERR_XML_ERROR,
_("unexpected root element <%s>, " _("unexpected root element <%s>, "
"expecting <volume>"), "expecting <volume>"),

2
src/conf/virnetworkobj.c
View File

@ -684,7 +684,7 @@ virNetworkLoadState(virNetworkObjListPtr nets,
/* now parse possible status data */ /* now parse possible status data */
node = xmlDocGetRootElement(xml); node = xmlDocGetRootElement(xml);
if (xmlStrEqual(node->name, BAD_CAST "networkstatus")) { if (virXMLNodeNameEqual(node, "networkstatus")) {
/* Newer network status file. Contains useful /* Newer network status file. Contains useful
* info which are not to be found in bare config XML */ * info which are not to be found in bare config XML */
char *class_id = NULL; char *class_id = NULL;

2
src/conf/virsavecookie.c
View File

@ -39,7 +39,7 @@ virSaveCookieParseNode(xmlXPathContextPtr ctxt,
{ {
*obj = NULL; *obj = NULL;
if (!xmlStrEqual(ctxt->node->name, BAD_CAST "cookie")) { if (!virXMLNodeNameEqual(ctxt->node, "cookie")) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("XML does not contain expected 'cookie' element")); _("XML does not contain expected 'cookie' element"));
return -1; return -1;

9
src/esx/esx_vi_types.c
View File

@ -33,6 +33,7 @@
#include "esx_vi.h" #include "esx_vi.h"
#include "esx_vi_types.h" #include "esx_vi_types.h"
#include "virstring.h" #include "virstring.h"
#include "virxml.h"
#define VIR_FROM_THIS VIR_FROM_ESX #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) \ #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) { \ if (esxVI_##_type##_Deserialize(childNode, &(*ptrptr)->_name) < 0) { \
goto failure; \ goto failure; \
} \ } \
@ -448,14 +449,14 @@ VIR_LOG_INIT("esx.esx_vi_types");
#define ESX_VI__TEMPLATE__PROPERTY__DESERIALIZE_IGNORE(_name) \ #define ESX_VI__TEMPLATE__PROPERTY__DESERIALIZE_IGNORE(_name) \
if (xmlStrEqual(childNode->name, BAD_CAST #_name)) { \ if (virXMLNodeNameEqual(childNode, #_name)) { \
continue; \ continue; \
} }
#define ESX_VI__TEMPLATE__PROPERTY__DESERIALIZE_VALUE(_type, _name) \ #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, \ if (esxVI_##_type##_DeserializeValue(childNode, \
&(*ptrptr)->_name) < 0) { \ &(*ptrptr)->_name) < 0) { \
goto failure; \ goto failure; \
@ -467,7 +468,7 @@ VIR_LOG_INIT("esx.esx_vi_types");
#define ESX_VI__TEMPLATE__PROPERTY__DESERIALIZE_LIST(_type, _name) \ #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; \ esxVI_##_type *_name##Item = NULL; \
\ \
if (esxVI_##_type##_Deserialize(childNode, &_name##Item) < 0) { \ if (esxVI_##_type##_Deserialize(childNode, &_name##Item) < 0) { \

2
src/security/virt-aa-helper.c
View File

@ -616,7 +616,7 @@ caps_mockup(vahControl * ctl, const char *xmlStr)
goto cleanup; goto cleanup;
} }
if (!xmlStrEqual(ctxt->node->name, BAD_CAST "domain")) { if (!virXMLNodeNameEqual(ctxt->node, "domain")) {
vah_error(NULL, 0, _("unexpected root element, expecting <domain>")); vah_error(NULL, 0, _("unexpected root element, expecting <domain>"));
goto cleanup; goto cleanup;
} }

2
src/test/test_driver.c
View File

@ -1232,7 +1232,7 @@ testOpenParse(testDriverPtr privconn,
const char *file, const char *file,
xmlXPathContextPtr ctxt) xmlXPathContextPtr ctxt)
{ {
if (!xmlStrEqual(ctxt->node->name, BAD_CAST "node")) { if (!virXMLNodeNameEqual(ctxt->node, "node")) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("Root element is not 'node'")); _("Root element is not 'node'"));
goto error; goto error;

2
src/vz/vz_sdk.c
View File

@ -4676,7 +4676,7 @@ prlsdkParseSnapshotTree(const char *treexml)
goto cleanup; goto cleanup;
root = xmlDocGetRootElement(xml); root = xmlDocGetRootElement(xml);
if (!xmlStrEqual(root->name, BAD_CAST "ParallelsSavedStates")) { if (!virXMLNodeNameEqual(root, "ParallelsSavedStates")) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("unexpected root element: '%s'"), root->name); _("unexpected root element: '%s'"), root->name);
goto cleanup; goto cleanup;

18
tools/virsh-domain.c
View File

@ -3061,7 +3061,7 @@ cmdDomIfSetLink(vshControl *ctl, const vshCmd *cmd)
while (cur) { while (cur) {
if (cur->type == XML_ELEMENT_NODE && if (cur->type == XML_ELEMENT_NODE &&
xmlStrEqual(cur->name, BAD_CAST element)) { virXMLNodeNameEqual(cur, element)) {
value = virXMLPropString(cur, attr); value = virXMLPropString(cur, attr);
if (STRCASEEQ(value, iface)) { if (STRCASEEQ(value, iface)) {
@ -3084,7 +3084,7 @@ cmdDomIfSetLink(vshControl *ctl, const vshCmd *cmd)
while (cur) { while (cur) {
if (cur->type == XML_ELEMENT_NODE && if (cur->type == XML_ELEMENT_NODE &&
xmlStrEqual(cur->name, BAD_CAST "link")) { virXMLNodeNameEqual(cur, "link")) {
/* found, just modify the property */ /* found, just modify the property */
xmlSetProp(cur, BAD_CAST "state", BAD_CAST state); xmlSetProp(cur, BAD_CAST "state", BAD_CAST state);
@ -11704,7 +11704,7 @@ virshDomainDetachInterface(char *doc,
cur = obj->nodesetval->nodeTab[i]->children; cur = obj->nodesetval->nodeTab[i]->children;
while (cur != NULL) { while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE && if (cur->type == XML_ELEMENT_NODE &&
xmlStrEqual(cur->name, BAD_CAST "mac")) { virXMLNodeNameEqual(cur, "mac")) {
char *tmp_mac = virXMLPropString(cur, "address"); char *tmp_mac = virXMLPropString(cur, "address");
diff_mac = virMacAddrCompare(tmp_mac, mac); diff_mac = virMacAddrCompare(tmp_mac, mac);
VIR_FREE(tmp_mac); VIR_FREE(tmp_mac);
@ -11859,7 +11859,7 @@ virshFindDisk(const char *doc,
is_supported = false; is_supported = false;
/* Check if the disk is CDROM or floppy disk */ /* 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"); char *device_value = virXMLPropString(n, "device");
if (STREQ(device_value, "cdrom") || if (STREQ(device_value, "cdrom") ||
@ -11878,13 +11878,13 @@ virshFindDisk(const char *doc,
if (cur->type == XML_ELEMENT_NODE) { if (cur->type == XML_ELEMENT_NODE) {
char *tmp = NULL; char *tmp = NULL;
if (xmlStrEqual(cur->name, BAD_CAST "source")) { if (virXMLNodeNameEqual(cur, "source")) {
if ((tmp = virXMLPropString(cur, "file")) || if ((tmp = virXMLPropString(cur, "file")) ||
(tmp = virXMLPropString(cur, "dev")) || (tmp = virXMLPropString(cur, "dev")) ||
(tmp = virXMLPropString(cur, "dir")) || (tmp = virXMLPropString(cur, "dir")) ||
(tmp = virXMLPropString(cur, "name"))) { (tmp = virXMLPropString(cur, "name"))) {
} }
} else if (xmlStrEqual(cur->name, BAD_CAST "target")) { } else if (virXMLNodeNameEqual(cur, "target")) {
tmp = virXMLPropString(cur, "dev"); tmp = virXMLPropString(cur, "dev");
} }
@ -11963,13 +11963,13 @@ virshUpdateDiskXML(xmlNodePtr disk_node,
if (tmp->type != XML_ELEMENT_NODE) if (tmp->type != XML_ELEMENT_NODE)
continue; continue;
if (xmlStrEqual(tmp->name, BAD_CAST "source")) if (virXMLNodeNameEqual(tmp, "source"))
source = tmp; source = tmp;
if (xmlStrEqual(tmp->name, BAD_CAST "target")) if (virXMLNodeNameEqual(tmp, "target"))
target_node = tmp; target_node = tmp;
if (xmlStrEqual(tmp->name, BAD_CAST "backingStore")) if (virXMLNodeNameEqual(tmp, "backingStore"))
backingStore = tmp; backingStore = tmp;
/* /*

12
tools/virsh-interface.c
View File

@ -939,9 +939,9 @@ cmdInterfaceBridge(vshControl *ctl, const vshCmd *cmd)
cur = cur->next; cur = cur->next;
if ((old->type == XML_ELEMENT_NODE) && if ((old->type == XML_ELEMENT_NODE) &&
(xmlStrEqual(old->name, BAD_CAST "mac") || /* ethernet stuff to move down */ (virXMLNodeNameEqual(old, "mac") || /* ethernet stuff to move down */
xmlStrEqual(old->name, BAD_CAST "bond") || /* bond stuff to move down */ virXMLNodeNameEqual(old, "bond") || /* bond stuff to move down */
xmlStrEqual(old->name, BAD_CAST "vlan"))) { /* vlan stuff to move down */ virXMLNodeNameEqual(old, "vlan"))) { /* vlan stuff to move down */
xmlUnlinkNode(old); xmlUnlinkNode(old);
if (!xmlAddChild(if_node, old)) { if (!xmlAddChild(if_node, old)) {
vshError(ctl, _("Failed to move '%s' element in xml document"), old->name); 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; cur = cur->next;
if ((old->type == XML_ELEMENT_NODE) && if ((old->type == XML_ELEMENT_NODE) &&
(xmlStrEqual(old->name, BAD_CAST "mac") || /* ethernet stuff to move down */ (virXMLNodeNameEqual(old, "mac") || /* ethernet stuff to move down */
xmlStrEqual(old->name, BAD_CAST "bond") || /* bond stuff to move down */ virXMLNodeNameEqual(old, "bond") || /* bond stuff to move down */
xmlStrEqual(old->name, BAD_CAST "vlan"))) { /* vlan stuff to move down */ virXMLNodeNameEqual(old, "vlan"))) { /* vlan stuff to move down */
xmlUnlinkNode(old); xmlUnlinkNode(old);
if (!xmlAddChild(top_node, old)) { if (!xmlAddChild(top_node, old)) {
vshError(ctl, _("Failed to move '%s' element in xml document"), old->name); vshError(ctl, _("Failed to move '%s' element in xml document"), old->name);