forked from pool/libvirt
This commit is contained in:
parent
471080a25f
commit
a9f424b01b
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 2 10:43:20 MST 2008 - jfehlig@novell.com
|
||||
|
||||
- Refresh xen-maxmem.patch to match upstream
|
||||
bnc#431766
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 25 14:09:08 MST 2008 - jfehlig@novell.com
|
||||
|
||||
|
@ -49,7 +49,7 @@ License: LGPL v2.1 or later
|
||||
Group: Development/Libraries/C and C++
|
||||
AutoReqProv: yes
|
||||
Version: 0.4.6
|
||||
Release: 10
|
||||
Release: 11
|
||||
Summary: A C toolkit to interract with the virtualization capabilities of Linux
|
||||
Requires: readline
|
||||
Requires: ncurses
|
||||
@ -324,6 +324,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{py_sitedir}/libvirtmod*
|
||||
|
||||
%changelog
|
||||
* Tue Dec 02 2008 jfehlig@novell.com
|
||||
- Refresh xen-maxmem.patch to match upstream
|
||||
bnc#431766
|
||||
* Tue Nov 25 2008 jfehlig@novell.com
|
||||
- Add network to Required-Start in libvirtd init script
|
||||
bnc#448756
|
||||
|
@ -1,13 +1,21 @@
|
||||
Index: libvirt-0.4.6/src/xen_internal.c
|
||||
Index: libvirt-0.4.6/src/xen_unified.c
|
||||
===================================================================
|
||||
--- libvirt-0.4.6.orig/src/xen_internal.c
|
||||
+++ libvirt-0.4.6/src/xen_internal.c
|
||||
@@ -695,7 +695,7 @@ struct xenUnifiedDriver xenHypervisorDri
|
||||
xenHypervisorDestroyDomain, /* domainDestroy */
|
||||
xenHypervisorDomainGetOSType, /* domainGetOSType */
|
||||
xenHypervisorGetMaxMemory, /* domainGetMaxMemory */
|
||||
- xenHypervisorSetMaxMemory, /* domainSetMaxMemory */
|
||||
+ NULL, /* domainSetMaxMemory */
|
||||
NULL, /* domainSetMemory */
|
||||
xenHypervisorGetDomainInfo, /* domainGetInfo */
|
||||
NULL, /* domainSave */
|
||||
--- libvirt-0.4.6.orig/src/xen_unified.c
|
||||
+++ libvirt-0.4.6/src/xen_unified.c
|
||||
@@ -799,8 +799,15 @@ xenUnifiedDomainSetMaxMemory (virDomainP
|
||||
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;
|
||||
|
Loading…
Reference in New Issue
Block a user