External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-05 00:13:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

virsh: Use vshFindDisk and vshPrepareDiskXML in cmdDetachDisk

Browse Source 
The first use of the two new helper functions.
This commit is contained in:
Osier Yang 2012-02-14 17:16:53 +08:00
parent 025998eb79
commit 42accf1b67
1 changed files with 10 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
tools/virsh.c
View File

@ -14391,7 +14391,6 @@ typedef enum {
* @path: Fully-qualified path or target of disk device. * @path: Fully-qualified path or target of disk device.
* @type: Either VSH_FIND_DISK_NORMAL or VSH_FIND_DISK_CHANGEABLE. * @type: Either VSH_FIND_DISK_NORMAL or VSH_FIND_DISK_CHANGEABLE.
*/ */
ATTRIBUTE_UNUSED
static xmlNodePtr static xmlNodePtr
vshFindDisk(const char *doc, vshFindDisk(const char *doc,
const char *path, const char *path,
@ -14489,7 +14488,6 @@ typedef enum {
* for changeable disk. Returns the processed XML as string on * for changeable disk. Returns the processed XML as string on
* success, or NULL on failure. Caller must free the result. * success, or NULL on failure. Caller must free the result.
*/ */
ATTRIBUTE_UNUSED
static char * static char *
vshPrepareDiskXML(xmlNodePtr disk_node, vshPrepareDiskXML(xmlNodePtr disk_node,
const char *source, const char *source,
@ -14615,18 +14613,14 @@ static const vshCmdOptDef opts_detach_disk[] = {
static bool static bool
cmdDetachDisk(vshControl *ctl, const vshCmd *cmd) cmdDetachDisk(vshControl *ctl, const vshCmd *cmd)
{ {
xmlDocPtr xml = NULL; char *disk_xml = NULL;
xmlXPathObjectPtr obj=NULL;
xmlXPathContextPtr ctxt = NULL;
xmlNodePtr cur = NULL;
xmlBufferPtr xml_buf = NULL;
virDomainPtr dom = NULL; virDomainPtr dom = NULL;
const char *target = NULL; const char *target = NULL;
char *doc; char *doc;
int i = 0, diff_tgt;
int ret; int ret;
bool functionReturn = false; bool functionReturn = false;
unsigned int flags; unsigned int flags;
xmlNodePtr disk_node = NULL;
if (!vshConnectionUsability(ctl, ctl->conn)) if (!vshConnectionUsability(ctl, ctl->conn))
goto cleanup; goto cleanup;
@ -14641,60 +14635,22 @@ cmdDetachDisk(vshControl *ctl, const vshCmd *cmd)
if (!doc) if (!doc)
goto cleanup; goto cleanup;
xml = virXMLParseStringCtxt(doc, _("(domain_definition)"), &ctxt); if (!(disk_node = vshFindDisk(doc, target, VSH_FIND_DISK_NORMAL)))
VIR_FREE(doc);
if (!xml) {
vshError(ctl, "%s", _("Failed to get disk information"));
goto cleanup; goto cleanup;
}
obj = xmlXPathEval(BAD_CAST "/domain/devices/disk", ctxt); if (!(disk_xml = vshPrepareDiskXML(disk_node, NULL, NULL,
if ((obj == NULL) || (obj->type != XPATH_NODESET) || VSH_PREPARE_DISK_XML_NONE)))
(obj->nodesetval == NULL) || (obj->nodesetval->nodeNr == 0)) {
vshError(ctl, "%s", _("Failed to get disk information"));
goto cleanup; goto cleanup;
}
/* search target */
for (; i < obj->nodesetval->nodeNr; i++) {
cur = obj->nodesetval->nodeTab[i]->children;
while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE &&
xmlStrEqual(cur->name, BAD_CAST "target")) {
char *tmp_tgt = virXMLPropString(cur, "dev");
diff_tgt = STREQ(tmp_tgt, target);
VIR_FREE(tmp_tgt);
if (diff_tgt) {
goto hit;
}
}
cur = cur->next;
}
}
vshError(ctl, _("No found disk whose target is %s"), target);
goto cleanup;
hit:
xml_buf = xmlBufferCreate();
if (!xml_buf) {
vshError(ctl, "%s", _("Failed to allocate memory"));
goto cleanup;
}
if (xmlNodeDump(xml_buf, xml, obj->nodesetval->nodeTab[i], 0, 0) < 0) {
vshError(ctl, "%s", _("Failed to create XML"));
goto cleanup;
}
if (vshCommandOptBool(cmd, "persistent")) { if (vshCommandOptBool(cmd, "persistent")) {
flags = VIR_DOMAIN_AFFECT_CONFIG; flags = VIR_DOMAIN_AFFECT_CONFIG;
if (virDomainIsActive(dom) == 1) if (virDomainIsActive(dom) == 1)
flags |= VIR_DOMAIN_AFFECT_LIVE; flags |= VIR_DOMAIN_AFFECT_LIVE;
ret = virDomainDetachDeviceFlags(dom, ret = virDomainDetachDeviceFlags(dom,
(char *)xmlBufferContent(xml_buf), disk_xml,
flags); flags);
} else { } else {
ret = virDomainDetachDevice(dom, (char *)xmlBufferContent(xml_buf)); ret = virDomainDetachDevice(dom, disk_xml);
} }
if (ret != 0) { if (ret != 0) {
@ -14705,10 +14661,9 @@ cmdDetachDisk(vshControl *ctl, const vshCmd *cmd)
} }
cleanup: cleanup:
xmlXPathFreeObject(obj); xmlFreeNode(disk_node);
xmlXPathFreeContext(ctxt); VIR_FREE(disk_xml);
xmlFreeDoc(xml); VIR_FREE(doc);
xmlBufferFree(xml_buf);
if (dom) if (dom)
virDomainFree(dom); virDomainFree(dom);
return functionReturn; return functionReturn;