openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

virsh-domain: use virXMLNodeToString instead of xmlNodeDump

This commit is contained in:
Peter Krempa 2013-09-04 17:27:27 +02:00
parent be0f0c2292
commit 3df33d7ad5
1 changed files with 31 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
tools/virsh-domain.c
View File

@ -2359,7 +2359,7 @@ cmdDomIfSetLink(vshControl *ctl, const vshCmd *cmd)
xmlXPathContextPtr ctxt = NULL; xmlXPathContextPtr ctxt = NULL;
xmlXPathObjectPtr obj = NULL; xmlXPathObjectPtr obj = NULL;
xmlNodePtr cur = NULL; xmlNodePtr cur = NULL;
xmlBufferPtr xml_buf = NULL; char *xml_buf = NULL;
if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL)))
return false; return false;
@ -2464,18 +2464,13 @@ hit:
goto cleanup; goto cleanup;
} }
xml_buf = xmlBufferCreate(); if (!(xml_buf = virXMLNodeToString(xml, obj->nodesetval->nodeTab[i]))) {
if (!xml_buf) { vshSaveLibvirtError();
vshError(ctl, _("Failed to allocate memory"));
goto cleanup;
}
if (xmlNodeDump(xml_buf, xml, obj->nodesetval->nodeTab[i], 0, 0) < 0) {
vshError(ctl, _("Failed to create XML")); vshError(ctl, _("Failed to create XML"));
goto cleanup; goto cleanup;
} }
if (virDomainUpdateDeviceFlags(dom, (char *)xmlBufferContent(xml_buf), flags) < 0) { if (virDomainUpdateDeviceFlags(dom, xml_buf, flags) < 0) {
vshError(ctl, _("Failed to update interface link state")); vshError(ctl, _("Failed to update interface link state"));
goto cleanup; goto cleanup;
} else { } else {
@ -2487,10 +2482,8 @@ cleanup:
xmlXPathFreeObject(obj); xmlXPathFreeObject(obj);
xmlXPathFreeContext(ctxt); xmlXPathFreeContext(ctxt);
xmlFreeDoc(xml); xmlFreeDoc(xml);
xmlBufferFree(xml_buf); VIR_FREE(xml_buf);
virDomainFree(dom);
if (dom)
virDomainFree(dom);
return ret; return ret;
} }
@ -6043,11 +6036,10 @@ cmdCPUCompare(vshControl *ctl, const vshCmd *cmd)
bool ret = false; bool ret = false;
char *buffer; char *buffer;
int result; int result;
const char *snippet; char *snippet = NULL;
xmlDocPtr xml = NULL; xmlDocPtr xml = NULL;
xmlXPathContextPtr ctxt = NULL; xmlXPathContextPtr ctxt = NULL;
xmlBufferPtr xml_buf = NULL;
xmlNodePtr node; xmlNodePtr node;
if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0)
@ -6063,17 +6055,10 @@ cmdCPUCompare(vshControl *ctl, const vshCmd *cmd)
if ((node = virXPathNode("/cpu|" if ((node = virXPathNode("/cpu|"
"/domain/cpu|" "/domain/cpu|"
"/capabilities/host/cpu", ctxt))) { "/capabilities/host/cpu", ctxt))) {
if (!(xml_buf = xmlBufferCreate())) { if (!(snippet = virXMLNodeToString(xml, node))) {
vshError(ctl, _("Can't create XML buffer to extract CPU element.")); vshSaveLibvirtError();
goto cleanup; goto cleanup;
} }
if (xmlNodeDump(xml_buf, xml, node, 0, 0) < 0) {
vshError(ctl, _("Failed to extract CPU element snippet from domain XML."));
goto cleanup;
}
snippet = (const char *) xmlBufferContent(xml_buf);
} else { } else {
vshError(ctl, _("File '%s' does not contain a <cpu> element or is not " vshError(ctl, _("File '%s' does not contain a <cpu> element or is not "
"a valid domain or capabilities XML"), from); "a valid domain or capabilities XML"), from);
@ -6109,7 +6094,7 @@ cmdCPUCompare(vshControl *ctl, const vshCmd *cmd)
cleanup: cleanup:
VIR_FREE(buffer); VIR_FREE(buffer);
xmlBufferFree(xml_buf); VIR_FREE(snippet);
xmlXPathFreeContext(ctxt); xmlXPathFreeContext(ctxt);
xmlFreeDoc(xml); xmlFreeDoc(xml);
@ -6156,7 +6141,6 @@ cmdCPUBaseline(vshControl *ctl, const vshCmd *cmd)
xmlDocPtr xml = NULL; xmlDocPtr xml = NULL;
xmlNodePtr *node_list = NULL; xmlNodePtr *node_list = NULL;
xmlXPathContextPtr ctxt = NULL; xmlXPathContextPtr ctxt = NULL;
xmlBufferPtr xml_buf = NULL;
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
size_t i; size_t i;
@ -6192,18 +6176,11 @@ cmdCPUBaseline(vshControl *ctl, const vshCmd *cmd)
list = vshCalloc(ctl, count, sizeof(const char *)); list = vshCalloc(ctl, count, sizeof(const char *));
if (!(xml_buf = xmlBufferCreate()))
goto no_memory;
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
xmlBufferEmpty(xml_buf); if (!(list[i] = virXMLNodeToString(xml, node_list[i]))) {
vshSaveLibvirtError();
if (xmlNodeDump(xml_buf, xml, node_list[i], 0, 0) < 0) {
vshError(ctl, _("Failed to extract <cpu> element"));
goto cleanup; goto cleanup;
} }
list[i] = vshStrdup(ctl, (const char *)xmlBufferContent(xml_buf));
} }
result = virConnectBaselineCPU(ctl->conn, result = virConnectBaselineCPU(ctl->conn,
@ -6217,7 +6194,6 @@ cmdCPUBaseline(vshControl *ctl, const vshCmd *cmd)
cleanup: cleanup:
xmlXPathFreeContext(ctxt); xmlXPathFreeContext(ctxt);
xmlFreeDoc(xml); xmlFreeDoc(xml);
xmlBufferFree(xml_buf);
VIR_FREE(result); VIR_FREE(result);
if (list != NULL && count > 0) { if (list != NULL && count > 0) {
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
@ -9593,7 +9569,7 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd)
xmlXPathObjectPtr obj=NULL; xmlXPathObjectPtr obj=NULL;
xmlXPathContextPtr ctxt = NULL; xmlXPathContextPtr ctxt = NULL;
xmlNodePtr cur = NULL, matchNode = NULL; xmlNodePtr cur = NULL, matchNode = NULL;
xmlBufferPtr xml_buf = NULL; char *detach_xml = NULL;
const char *mac =NULL, *type = NULL; const char *mac =NULL, *type = NULL;
char *doc = NULL; char *doc = NULL;
char buf[64]; char buf[64];
@ -9686,25 +9662,16 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd)
goto cleanup; goto cleanup;
} }
hit: hit:
xml_buf = xmlBufferCreate(); if (!(detach_xml = virXMLNodeToString(xml, matchNode))) {
if (!xml_buf) { vshSaveLibvirtError();
vshError(ctl, "%s", _("Failed to allocate memory"));
goto cleanup; goto cleanup;
} }
if (xmlNodeDump(xml_buf, xml, matchNode, 0, 0) < 0) { if (flags != 0)
vshError(ctl, "%s", _("Failed to create XML")); ret = virDomainDetachDeviceFlags(dom, detach_xml, flags);
goto cleanup; else
} ret = virDomainDetachDevice(dom, detach_xml);
if (flags != 0) {
ret = virDomainDetachDeviceFlags(dom,
(char *)xmlBufferContent(xml_buf),
flags);
} else {
ret = virDomainDetachDevice(dom, (char *)xmlBufferContent(xml_buf));
}
if (ret != 0) { if (ret != 0) {
vshError(ctl, "%s", _("Failed to detach interface")); vshError(ctl, "%s", _("Failed to detach interface"));
@ -9713,13 +9680,13 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd)
functionReturn = true; functionReturn = true;
} }
cleanup: cleanup:
VIR_FREE(doc); VIR_FREE(doc);
VIR_FREE(detach_xml);
virDomainFree(dom); virDomainFree(dom);
xmlXPathFreeObject(obj); xmlXPathFreeObject(obj);
xmlXPathFreeContext(ctxt); xmlXPathFreeContext(ctxt);
xmlFreeDoc(xml); xmlFreeDoc(xml);
xmlBufferFree(xml_buf);
return functionReturn; return functionReturn;
} }
@ -9837,21 +9804,14 @@ vshPrepareDiskXML(xmlNodePtr disk_node,
int type) int type)
{ {
xmlNodePtr cur = NULL; xmlNodePtr cur = NULL;
xmlBufferPtr xml_buf = NULL; const char *disk_type = NULL;
char *disk_type = NULL; const char *device_type = NULL;
char *device_type = NULL;
xmlNodePtr new_node = NULL; xmlNodePtr new_node = NULL;
char *ret = NULL; char *ret = NULL;
if (!disk_node) if (!disk_node)
return NULL; return NULL;
xml_buf = xmlBufferCreate();
if (!xml_buf) {
vshError(NULL, "%s", _("Failed to allocate memory"));
return NULL;
}
device_type = virXMLPropString(disk_node, "device"); device_type = virXMLPropString(disk_node, "device");
if (STREQ_NULLABLE(device_type, "cdrom") || if (STREQ_NULLABLE(device_type, "cdrom") ||
@ -9873,7 +9833,7 @@ vshPrepareDiskXML(xmlNodePtr disk_node,
if (type == VSH_PREPARE_DISK_XML_EJECT) { if (type == VSH_PREPARE_DISK_XML_EJECT) {
vshError(NULL, _("The disk device '%s' doesn't have media"), vshError(NULL, _("The disk device '%s' doesn't have media"),
path); path);
goto error; goto cleanup;
} }
if (source) { if (source) {
@ -9885,10 +9845,10 @@ vshPrepareDiskXML(xmlNodePtr disk_node,
xmlAddChild(disk_node, new_node); xmlAddChild(disk_node, new_node);
} else if (type == VSH_PREPARE_DISK_XML_INSERT) { } else if (type == VSH_PREPARE_DISK_XML_INSERT) {
vshError(NULL, _("No source is specified for inserting media")); vshError(NULL, _("No source is specified for inserting media"));
goto error; goto cleanup;
} else if (type == VSH_PREPARE_DISK_XML_UPDATE) { } else if (type == VSH_PREPARE_DISK_XML_UPDATE) {
vshError(NULL, _("No source is specified for updating media")); vshError(NULL, _("No source is specified for updating media"));
goto error; goto cleanup;
} }
} }
@ -9896,7 +9856,7 @@ vshPrepareDiskXML(xmlNodePtr disk_node,
if (type == VSH_PREPARE_DISK_XML_INSERT) { if (type == VSH_PREPARE_DISK_XML_INSERT) {
vshError(NULL, _("The disk device '%s' already has media"), vshError(NULL, _("The disk device '%s' already has media"),
path); path);
goto error; goto cleanup;
} }
/* Remove the source if it tends to eject/update media. */ /* Remove the source if it tends to eject/update media. */
@ -9912,30 +9872,15 @@ vshPrepareDiskXML(xmlNodePtr disk_node,
} }
} }
if (xmlNodeDump(xml_buf, NULL, disk_node, 0, 0) < 0) { if (!(ret = virXMLNodeToString(NULL, disk_node))) {
vshError(NULL, "%s", _("Failed to create XML")); vshSaveLibvirtError();
goto error; goto cleanup;
} }
goto cleanup;
cleanup: cleanup:
VIR_FREE(device_type); VIR_FREE(device_type);
VIR_FREE(disk_type); VIR_FREE(disk_type);
if (xml_buf) {
int len = xmlBufferLength(xml_buf);
if (VIR_ALLOC_N(ret, len + 1) < 0)
return NULL;
memcpy(ret, (char *)xmlBufferContent(xml_buf), len);
ret[len] = '\0';
xmlBufferFree(xml_buf);
}
return ret; return ret;
error:
xmlBufferFree(xml_buf);
xml_buf = NULL;
goto cleanup;
} }