summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Veillard <veillard@redhat.com>2008-11-27 16:16:13 +0000
committerDaniel Veillard <veillard@redhat.com>2008-11-27 16:16:13 +0000
commit431d40fa9ca89e632e88a32272796731bda98fbc (patch)
treeab661abcdb47aafb1ed28be4b4953893b52f0a51 /src
parent* libvirt.spec.in: cleanups and missing dep for hal (diff)
downloadlibvirt-431d40fa9ca89e632e88a32272796731bda98fbc.tar.gz
libvirt-431d40fa9ca89e632e88a32272796731bda98fbc.tar.bz2
libvirt-431d40fa9ca89e632e88a32272796731bda98fbc.zip
* src/xen_unified.c: use preferably xend method to update
the maximum memory of a xen guest (Jim Fehlig) Daniel
Diffstat (limited to 'src')
-rw-r--r--src/xen_unified.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/xen_unified.c b/src/xen_unified.c
index cce608c05..ef3784780 100644
--- 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;