From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hollis Blanchard Subject: [PATCH][XEN][POWERPC] avoid xc_get_tot_pages() in the prose builder Date: Fri, 08 Dec 2006 14:25:11 -0600 Message-ID: <1165609511.23364.15.camel@basalt> References: <1165344436.11779.27.camel@basalt> Reply-To: Hollis Blanchard Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0164437679==" Return-path: In-Reply-To: <1165344436.11779.27.camel@basalt> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Mime-version: 1.0 Sender: xen-ppc-devel-bounces@lists.xensource.com Errors-To: xen-ppc-devel-bounces@lists.xensource.com To: Keir Fraser Cc: xen-devel , xen-ppc-devel List-Id: xen-devel@lists.xenproject.org --===============0164437679== Content-Type: multipart/alternative; boundary="=-0U/BeTzqueh5oo1zAF+G" --=-0U/BeTzqueh5oo1zAF+G Content-Type: text/plain Content-Transfer-Encoding: 7bit Avoid xc_get_tot_pages() in the prose builder. Signed-off-by: Hollis Blanchard diff -r 9d83185b4c37 tools/libxc/powerpc64/xc_prose_build.c --- a/tools/libxc/powerpc64/xc_prose_build.c Fri Dec 01 19:11:02 2006 -0500 +++ b/tools/libxc/powerpc64/xc_prose_build.c Fri Dec 01 17:18:44 2006 -0600 @@ -230,6 +230,7 @@ static void free_page_array(xen_pfn_t *p int xc_prose_build(int xc_handle, uint32_t domid, + unsigned int mem_mb, const char *image_name, const char *initrd_name, const char *cmdline, @@ -257,8 +258,7 @@ int xc_prose_build(int xc_handle, DPRINTF("cmdline=%s\n", cmdline); - DPRINTF("xc_get_tot_pages\n"); - nr_pages = xc_get_tot_pages(xc_handle, domid); + nr_pages = mem_mb << (20 - PAGE_SHIFT); DPRINTF("nr_pages 0x%lx\n", nr_pages); rma_pages = get_rma_pages(devtree); diff -r 9d83185b4c37 tools/libxc/xenguest.h --- a/tools/libxc/xenguest.h Fri Dec 01 19:11:02 2006 -0500 +++ b/tools/libxc/xenguest.h Tue Dec 05 10:45:10 2006 -0600 @@ -124,6 +124,7 @@ int xc_get_hvm_param( int xc_prose_build(int xc_handle, uint32_t domid, + unsigned int mem_mb, const char *image_name, const char *ramdisk_name, const char *cmdline, diff -r 9d83185b4c37 tools/python/xen/xend/image.py --- a/tools/python/xen/xend/image.py Fri Dec 01 19:11:02 2006 -0500 +++ b/tools/python/xen/xend/image.py Tue Dec 05 10:44:22 2006 -0600 @@ -273,6 +282,7 @@ class PPC_ProseImageHandler(LinuxImageHa devtree = FlatDeviceTree.build(self) return xc.prose_build(dom = self.vm.getDomid(), + memsize = mem_mb, image = self.kernel, store_evtchn = store_evtchn, console_evtchn = console_evtchn, -- Hollis Blanchard IBM Linux Technology Center --=-0U/BeTzqueh5oo1zAF+G Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: 7bit Avoid xc_get_tot_pages() in the prose builder.

Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>

diff -r 9d83185b4c37 tools/libxc/powerpc64/xc_prose_build.c
--- a/tools/libxc/powerpc64/xc_prose_build.c	Fri Dec 01 19:11:02 2006 -0500
+++ b/tools/libxc/powerpc64/xc_prose_build.c	Fri Dec 01 17:18:44 2006 -0600
@@ -230,6 +230,7 @@ static void free_page_array(xen_pfn_t *p
 
 int xc_prose_build(int xc_handle,
                    uint32_t domid,
+                   unsigned int mem_mb,
                    const char *image_name,
                    const char *initrd_name,
                    const char *cmdline,
@@ -257,8 +258,7 @@ int xc_prose_build(int xc_handle,
 
     DPRINTF("cmdline=%s\n", cmdline);
 
-    DPRINTF("xc_get_tot_pages\n");
-    nr_pages = xc_get_tot_pages(xc_handle, domid);
+    nr_pages = mem_mb << (20 - PAGE_SHIFT);
     DPRINTF("nr_pages 0x%lx\n", nr_pages);
 
     rma_pages = get_rma_pages(devtree);
diff -r 9d83185b4c37 tools/libxc/xenguest.h
--- a/tools/libxc/xenguest.h	Fri Dec 01 19:11:02 2006 -0500
+++ b/tools/libxc/xenguest.h	Tue Dec 05 10:45:10 2006 -0600
@@ -124,6 +124,7 @@ int xc_get_hvm_param(
 
 int xc_prose_build(int xc_handle,
                    uint32_t domid,
+                   unsigned int mem_mb,
                    const char *image_name,
                    const char *ramdisk_name,
                    const char *cmdline,
diff -r 9d83185b4c37 tools/python/xen/xend/image.py
--- a/tools/python/xen/xend/image.py	Fri Dec 01 19:11:02 2006 -0500
+++ b/tools/python/xen/xend/image.py	Tue Dec 05 10:44:22 2006 -0600
@@ -273,6 +282,7 @@ class PPC_ProseImageHandler(LinuxImageHa
         devtree = FlatDeviceTree.build(self)
 
         return xc.prose_build(dom            = self.vm.getDomid(),
+                              memsize        = mem_mb,
                               image          = self.kernel,
                               store_evtchn   = store_evtchn,
                               console_evtchn = console_evtchn,



-- 
Hollis Blanchard
IBM Linux Technology Center
--=-0U/BeTzqueh5oo1zAF+G-- --===============0164437679== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-ppc-devel mailing list Xen-ppc-devel@lists.xensource.com http://lists.xensource.com/xen-ppc-devel --===============0164437679==--