From 431d40fa9ca89e632e88a32272796731bda98fbc Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Thu, 27 Nov 2008 16:16:13 +0000 Subject: [PATCH] * src/xen_unified.c: use preferably xend method to update the maximum memory of a xen guest (Jim Fehlig) Daniel --- ChangeLog | 5 +++++ src/xen_unified.c | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d85ae4cfa6..ab1593e2b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Nov 27 17:15:10 CET 2008 Daniel Veillard + + * 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 * libvirt.spec.in: cleanups and missing dep for hal diff --git a/src/xen_unified.c b/src/xen_unified.c index cce608c05b..ef3784780d 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;