[libvirt] [PATCH] virsh: domain: Use inactive XML when unplugging interface with --config

Peter Krempa pkrempa at redhat.com
Fri Jul 4 13:08:37 UTC 2014


Similary to cmdDetachDisk fetch the inactive definition when --config
is specified as the active may not contain the network interface
if it was plugged with --config.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1056902
---
 tools/virsh-domain.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index b1ab911..3efaced 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -10131,7 +10131,12 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd)
         virDomainIsActive(dom) == 1)
         flags |= VIR_DOMAIN_AFFECT_LIVE;

-    if (!(doc = virDomainGetXMLDesc(dom, 0)))
+    if (flags & VIR_DOMAIN_AFFECT_CONFIG)
+        doc = virDomainGetXMLDesc(dom, VIR_DOMAIN_XML_INACTIVE);
+    else
+        doc = virDomainGetXMLDesc(dom, 0);
+
+    if (!doc)
         goto cleanup;

     if (!(xml = virXMLParseStringCtxt(doc, _("(domain_definition)"), &ctxt))) {
-- 
1.9.3




More information about the libvir-list mailing list