From a728e3cd80a533e1fc4705deb5e8800066687f99 Mon Sep 17 00:00:00 2001
Message-Id: <a728e3cd80a533e1fc4705deb5e8800066687f99.1287067706.git.jdenemar@redhat.com>
From: Jiri Denemark <jdenemar@redhat.com>
Date: Fri, 1 Oct 2010 16:37:53 +0200
Subject: [PATCH] xen: xenXMDomain*DeviceFlags should obey all flags

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

xenXMDomain*DeviceFlags() silently ignores requests to modify live
configuration of an active guest while still touching its persistent
configuration.
(cherry picked from commit e2856d36a5912022f0b9add9c8398661ed1d7c0a)
---
 src/xen/xm_internal.c |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c
index cc24da1..d74bd6d 100644
--- a/src/xen/xm_internal.c
+++ b/src/xen/xm_internal.c
@@ -2934,8 +2934,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);
@@ -3025,8 +3030,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);
-- 
1.7.3.1