External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-31 05:57:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

virsh: Do not check the input XML at virsh layer for cmdDetachDevice

Browse Source 
Any device XML doesn't use the same order as libvirt generates, or
uses decimal for attributes like "slot" of "<address>" will cause
device detaching to fail, as virsh compares the XML simply earlier
in strict manner before internal parsing.

This is regression introduced by ea7182c.
This commit is contained in:
Osier Yang 2012-02-07 23:56:08 +08:00
parent 9fbbcda6b7
commit c001eb5bbe
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tools/virsh.c
View File

@ -13153,6 +13153,7 @@ cmdAttachDevice(vshControl *ctl, const vshCmd *cmd)
* @n2 second node * @n2 second node
* returns true in case n1 covers n2, false otherwise. * returns true in case n1 covers n2, false otherwise.
*/ */
ATTRIBUTE_UNUSED
static bool static bool
vshNodeIsSuperset(xmlNodePtr n1, xmlNodePtr n2) vshNodeIsSuperset(xmlNodePtr n1, xmlNodePtr n2)
{ {
@ -13278,6 +13279,7 @@ cleanup:
* (is too ambiguous), 0 in case of success. Otherwise returns -1. @newXML * (is too ambiguous), 0 in case of success. Otherwise returns -1. @newXML
* is touched only in case of success. * is touched only in case of success.
*/ */
ATTRIBUTE_UNUSED
static int static int
vshCompleteXMLFromDomain(vshControl *ctl, virDomainPtr dom, char *oldXML, vshCompleteXMLFromDomain(vshControl *ctl, virDomainPtr dom, char *oldXML,
char **newXML) char **newXML)
@ -13412,7 +13414,7 @@ cmdDetachDevice(vshControl *ctl, const vshCmd *cmd)
{ {
virDomainPtr dom = NULL; virDomainPtr dom = NULL;
const char *from = NULL; const char *from = NULL;
char *buffer = NULL, *new_buffer = NULL; char *buffer = NULL;
int ret; int ret;
bool funcRet = false; bool funcRet = false;
unsigned int flags; unsigned int flags;
@ -13431,27 +13433,13 @@ cmdDetachDevice(vshControl *ctl, const vshCmd *cmd)
goto cleanup; goto cleanup;
} }
ret = vshCompleteXMLFromDomain(ctl, dom, buffer, &new_buffer);
if (ret < 0) {
if (ret == -2) {
vshError(ctl, _("no such device in %s"), virDomainGetName(dom));
} else if (ret == -3) {
vshError(ctl, "%s", _("given XML selects too many devices. "
"Please, be more specific"));
} else {
/* vshCompleteXMLFromDomain() already printed error message,
* so nothing to do here. */
}
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, new_buffer, flags); ret = virDomainDetachDeviceFlags(dom, buffer, flags);
} else { } else {
ret = virDomainDetachDevice(dom, new_buffer); ret = virDomainDetachDevice(dom, buffer);
} }
if (ret < 0) { if (ret < 0) {
@ -13463,7 +13451,6 @@ cmdDetachDevice(vshControl *ctl, const vshCmd *cmd)
funcRet = true; funcRet = true;
cleanup: cleanup:
VIR_FREE(new_buffer);
VIR_FREE(buffer); VIR_FREE(buffer);
virDomainFree(dom); virDomainFree(dom);
return funcRet; return funcRet;