提交 0bb64df1 编写于 作者: P Peter Krempa

virsh: Don't use legacy API if --current is used on device hot(un)plug

https://bugzilla.redhat.com/show_bug.cgi?id=1049529

The legacy virDomainAttachDevice and virDomainDetachDevice operate only
on active domains. When a user specified --current flag with an inactive
domain the old API was used and reported an error. Fix it by calling the
new API if --current is specified explicitly.
上级 8ab6f1ad
...@@ -230,7 +230,7 @@ cmdAttachDevice(vshControl *ctl, const vshCmd *cmd) ...@@ -230,7 +230,7 @@ cmdAttachDevice(vshControl *ctl, const vshCmd *cmd)
goto cleanup; goto cleanup;
} }
if (flags) if (flags || current)
rv = virDomainAttachDeviceFlags(dom, buffer, flags); rv = virDomainAttachDeviceFlags(dom, buffer, flags);
else else
rv = virDomainAttachDevice(dom, buffer); rv = virDomainAttachDevice(dom, buffer);
...@@ -669,7 +669,7 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) ...@@ -669,7 +669,7 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd)
virDomainIsActive(dom) == 1) virDomainIsActive(dom) == 1)
flags |= VIR_DOMAIN_AFFECT_LIVE; flags |= VIR_DOMAIN_AFFECT_LIVE;
if (flags) if (flags || current)
ret = virDomainAttachDeviceFlags(dom, xml, flags); ret = virDomainAttachDeviceFlags(dom, xml, flags);
else else
ret = virDomainAttachDevice(dom, xml); ret = virDomainAttachDevice(dom, xml);
...@@ -923,7 +923,7 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) ...@@ -923,7 +923,7 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd)
xml = virBufferContentAndReset(&buf); xml = virBufferContentAndReset(&buf);
if (flags) if (flags || current)
ret = virDomainAttachDeviceFlags(dom, xml, flags); ret = virDomainAttachDeviceFlags(dom, xml, flags);
else else
ret = virDomainAttachDevice(dom, xml); ret = virDomainAttachDevice(dom, xml);
...@@ -9609,7 +9609,7 @@ cmdDetachDevice(vshControl *ctl, const vshCmd *cmd) ...@@ -9609,7 +9609,7 @@ cmdDetachDevice(vshControl *ctl, const vshCmd *cmd)
goto cleanup; goto cleanup;
} }
if (flags != 0) if (flags != 0 || current)
ret = virDomainDetachDeviceFlags(dom, buffer, flags); ret = virDomainDetachDeviceFlags(dom, buffer, flags);
else else
ret = virDomainDetachDevice(dom, buffer); ret = virDomainDetachDevice(dom, buffer);
...@@ -9884,7 +9884,7 @@ hit: ...@@ -9884,7 +9884,7 @@ hit:
goto cleanup; goto cleanup;
} }
if (flags != 0) if (flags != 0 || current)
ret = virDomainDetachDeviceFlags(dom, detach_xml, flags); ret = virDomainDetachDeviceFlags(dom, detach_xml, flags);
else else
ret = virDomainDetachDevice(dom, detach_xml); ret = virDomainDetachDevice(dom, detach_xml);
...@@ -10189,7 +10189,7 @@ cmdDetachDisk(vshControl *ctl, const vshCmd *cmd) ...@@ -10189,7 +10189,7 @@ cmdDetachDisk(vshControl *ctl, const vshCmd *cmd)
VSH_PREPARE_DISK_XML_NONE))) VSH_PREPARE_DISK_XML_NONE)))
goto cleanup; goto cleanup;
if (flags != 0) if (flags != 0 || current)
ret = virDomainDetachDeviceFlags(dom, disk_xml, flags); ret = virDomainDetachDeviceFlags(dom, disk_xml, flags);
else else
ret = virDomainDetachDevice(dom, disk_xml); ret = virDomainDetachDevice(dom, disk_xml);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册