* src/xen_unified.c: use preferably xend method to update

  the maximum memory of a xen guest (Jim Fehlig)
Daniel

diff --git a/ChangeLog b/ChangeLog
index d85ae4cfa6e22cdb6baa62c20f5a7e346a203c87..ab1593e2b3379037c3cf71a5ed6c756867fbdc98 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov 27 17:15:10 CET 2008 Daniel Veillard <veillard@redhat.com>
+
+       * src/xen_unified.c: use preferably xend method to update
+         the maximum memory of a xen guest (Jim Fehlig)
+
 Wed Nov 26 15:46:07 CET 2008 Daniel Veillard <veillard@redhat.com>
 
        * libvirt.spec.in: cleanups and missing dep for hal

diff --git a/src/xen_unified.c b/src/xen_unified.c
index cce608c05b44e629d94a08bd42cd86e01042551e..ef3784780db09328b13d804fbf4cd37ccd542e35 100644 (file)
--- a/src/xen_unified.c
+++ b/src/xen_unified.c
@@ -819,8 +819,15 @@ xenUnifiedDomainSetMaxMemory (virDomainPtr dom, unsigned long memory)
     GET_PRIVATE(dom->conn);
     int i;
 
+    /* Prefer xend for setting max memory */
+    if (priv->opened[XEN_UNIFIED_XEND_OFFSET]) {
+        if (xenDaemonDomainSetMaxMemory (dom, memory) == 0)
+            return 0;
+    }
+
     for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
-        if (priv->opened[i] &&
+        if (i != XEN_UNIFIED_XEND_OFFSET &&
+            priv->opened[i] &&
             drivers[i]->domainSetMaxMemory &&
             drivers[i]->domainSetMaxMemory (dom, memory) == 0)
             return 0;