From: Jiri Denemark <jdenemar@redhat.com>
Date: Fri, 1 Oct 2010 14:37:53 +0000 (+0200)
Subject: xen: xenXMDomain*DeviceFlags should obey all flags
X-Git-Tag: v0.8.5~180
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2856d36a5912022f0b9add9c8398661ed1d7c0a;p=thirdparty%2Flibvirt.git

xen: xenXMDomain*DeviceFlags should obey all flags

xenXMDomain*DeviceFlags() silently ignores requests to modify live
configuration of an active guest while still touching its persistent
configuration.
---

diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c
index 4c62072bd8..a30d78154e 100644
--- a/src/xen/xm_internal.c
+++ b/src/xen/xm_internal.c
@@ -2935,8 +2935,13 @@ xenXMDomainAttachDeviceFlags(virDomainPtr domain, const char *xml,
 
     if (domain->conn->flags & VIR_CONNECT_RO)
         return -1;
-    if (domain->id != -1 && !(flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG))
+
+    if ((flags & VIR_DOMAIN_DEVICE_MODIFY_LIVE) ||
+        (domain->id != -1 && (flags & VIR_DOMAIN_DEVICE_MODIFY_CURRENT))) {
+        xenXMError(VIR_ERR_OPERATION_INVALID, "%s",
+                   _("Xm driver only supports modifying persistent config"));
         return -1;
+    }
 
     priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
     xenUnifiedLock(priv);
@@ -3026,8 +3031,13 @@ xenXMDomainDetachDeviceFlags(virDomainPtr domain, const char *xml,
 
     if (domain->conn->flags & VIR_CONNECT_RO)
         return -1;
-    if (domain->id != -1 && !(flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG))
+
+    if ((flags & VIR_DOMAIN_DEVICE_MODIFY_LIVE) ||
+        (domain->id != -1 && (flags & VIR_DOMAIN_DEVICE_MODIFY_CURRENT))) {
+        xenXMError(VIR_ERR_OPERATION_INVALID, "%s",
+                   _("Xm driver only supports modifying persistent config"));
         return -1;
+    }
 
     priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
     xenUnifiedLock(priv);