* src/xen_internal.c: one of the fix for system with page size != 4k

  was missing
Daniel

diff --git a/ChangeLog b/ChangeLog
index 462a896d3d45cb7b82d3f67cd055dcd6bca4d424..ec4b628fdd83f6f6ce4a1bc29beb7c241b9671d5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct 12 17:31:13 CEST 2006 Daniel Veillard <veillard@redhat.com>
+
+       * src/xen_internal.c: one of the fix for system with page size != 4k
+         was missing
+
 Thu Oct 12 13:37:24 CEST 2006 Daniel Veillard <veillard@redhat.com>
 
        * src/xen_internal.c: applied patch from Philippe Berthault

diff --git a/src/xen_internal.c b/src/xen_internal.c
index 8d08275360b6d084e36068da5b4dc3f37f5ea941..b497bff41f6ddd953ae2ed2576f088d78279dd6a 100644 (file)
--- a/src/xen_internal.c
+++ b/src/xen_internal.c
@@ -1466,6 +1466,12 @@ xenHypervisorGetDomMaxMemory(virConnectPtr conn, int id)
     if ((conn == NULL) || (conn->handle < 0))
         return (0);
 
+    if (kb_per_pages == 0) {
+        kb_per_pages = sysconf(_SC_PAGESIZE) / 1024;
+       if (kb_per_pages <= 0) 
+           kb_per_pages = 4;
+    }
+
     XEN_GETDOMAININFO_CLEAR(dominfo);
 
     ret = virXen_getdomaininfo(conn->handle, id, &dominfo);
@@ -1473,7 +1479,7 @@ xenHypervisorGetDomMaxMemory(virConnectPtr conn, int id)
     if ((ret < 0) || (XEN_GETDOMAININFO_DOMAIN(dominfo) != id))
         return (0);
 
-    return((unsigned long) XEN_GETDOMAININFO_MAX_PAGES(dominfo) * 4);
+    return((unsigned long) XEN_GETDOMAININFO_MAX_PAGES(dominfo) * kb_per_pages);
 }
 
 #ifndef PROXY