From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoph Egger Subject: Re: [PATCH] libxc: lzma build fix Date: Wed, 26 Jan 2011 18:27:24 +0100 Message-ID: <201101261827.25727.Christoph.Egger@amd.com> References: <201101261622.14583.Christoph.Egger@amd.com> <19776.18635.63919.190329@mariner.uk.xensource.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary-00=_9lFQNEfdpjtas8a" Return-path: In-Reply-To: <19776.18635.63919.190329@mariner.uk.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Ian Jackson Cc: "xen-devel@lists.xensource.com" List-Id: xen-devel@lists.xenproject.org --Boundary-00=_9lFQNEfdpjtas8a Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline On Wednesday 26 January 2011 17:16:11 Ian Jackson wrote: > Christoph Egger writes ("[Xen-devel] [PATCH] libxc: lzma build fix"): > > Attached patch lets libxc build with lzma support on NetBSD. > > NetBSD doesn't have sysconf(_SC_PHYS_PAGES). > > Can you please break this out into separate os-dependent code in an > appropriate different file ? These kind of #ifdefs break up the code > and make it hard to see what's going on. Yes. Attached patch factors physmem() out into os-dependent files and renamed it to xc_get_physmem() to not pollute the namespace. Signed-off-by: Christoph Egger -- ---to satisfy European Law for business letters: Advanced Micro Devices GmbH Einsteinring 24, 85609 Dornach b. Muenchen Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen Registergericht Muenchen, HRB Nr. 43632 --Boundary-00=_9lFQNEfdpjtas8a Content-Type: text/x-diff; charset="iso 8859-15"; name="xen_libxc_lzma.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="xen_libxc_lzma.diff" Content-Description: xen_libxc_lzma.diff diff -r c332e775ba53 tools/libxc/xc_dom_bzimageloader.c --- a/tools/libxc/xc_dom_bzimageloader.c Wed Jan 26 17:44:59 2011 +0100 +++ b/tools/libxc/xc_dom_bzimageloader.c Wed Jan 26 18:23:17 2011 +0100 @@ -140,27 +140,6 @@ static int xc_try_bzip2_decode( #include -static uint64_t physmem(void) -{ - uint64_t ret = 0; - const long pagesize = sysconf(_SC_PAGESIZE); - const long pages = sysconf(_SC_PHYS_PAGES); - - if ( (pagesize != -1) || (pages != -1) ) - { - /* - * According to docs, pagesize * pages can overflow. - * Simple case is 32-bit box with 4 GiB or more RAM, - * which may report exactly 4 GiB of RAM, and "long" - * being 32-bit will overflow. Casting to uint64_t - * hopefully avoids overflows in the near future. - */ - ret = (uint64_t)(pagesize) * (uint64_t)(pages); - } - - return ret; -} - static int xc_try_lzma_decode( struct xc_dom_image *dom, void **blob, size_t *size) { @@ -173,7 +152,7 @@ static int xc_try_lzma_decode( int outsize; const char *msg; - ret = lzma_alone_decoder(&stream, physmem() / 3); + ret = lzma_alone_decoder(&stream, xc_get_physmem() / 3); if ( ret != LZMA_OK ) { DOMPRINTF("LZMA: Failed to init stream decoder"); diff -r c332e775ba53 tools/libxc/xc_linux.c --- a/tools/libxc/xc_linux.c Wed Jan 26 17:44:59 2011 +0100 +++ b/tools/libxc/xc_linux.c Wed Jan 26 18:23:17 2011 +0100 @@ -55,6 +55,27 @@ void discard_file_cache(xc_interface *xc errno = saved_errno; } +uint64_t xc_get_physmem(void) +{ + uint64_t ret = 0; + const long pagesize = sysconf(_SC_PAGESIZE); + const long pages = sysconf(_SC_PHYS_PAGES); + + if ( (pagesize != -1) || (pages != -1) ) + { + /* + * According to docs, pagesize * pages can overflow. + * Simple case is 32-bit box with 4 GiB or more RAM, + * which may report exactly 4 GiB of RAM, and "long" + * being 32-bit will overflow. Casting to uint64_t + * hopefully avoids overflows in the near future. + */ + ret = (uint64_t)(pagesize) * (uint64_t)(pages); + } + + return ret; +} + /* * Local variables: * mode: C diff -r c332e775ba53 tools/libxc/xc_netbsd.c --- a/tools/libxc/xc_netbsd.c Wed Jan 26 17:44:59 2011 +0100 +++ b/tools/libxc/xc_netbsd.c Wed Jan 26 18:23:17 2011 +0100 @@ -23,6 +23,9 @@ #include #include #include +#include +#include +#include static xc_osdep_handle netbsd_privcmd_open(xc_interface *xch) { @@ -351,6 +354,24 @@ void discard_file_cache(xc_interface *xc errno = saved_errno; } +uint64_t xc_get_physmem(void) +{ + int mib[2], rc; + size_t len; + uint64_t physmem; + + mib[0] = CTL_HW; + mib[1] = HW_PHYSMEM64; + rc = sysctl(mib, 2, &physmem, &len, NULL, 0); + + if (rc == -1) { + /* PERROR("%s: Failed to get hw.physmem64: %s\n", strerror(errno)); */ + return 0; + } + + return physmem; +} + static struct xc_osdep_ops *netbsd_osdep_init(xc_interface *xch, enum xc_osdep_type type) { switch ( type ) diff -r c332e775ba53 tools/libxc/xc_private.h --- a/tools/libxc/xc_private.h Wed Jan 26 17:44:59 2011 +0100 +++ b/tools/libxc/xc_private.h Wed Jan 26 18:23:17 2011 +0100 @@ -275,6 +275,9 @@ void bitmap_byte_to_64(uint64_t *lp, con /* Optionally flush file to disk and discard page cache */ void discard_file_cache(xc_interface *xch, int fd, int flush); +/* How much physical RAM is available? */ +uint64_t xc_get_physmem(void); + #define MAX_MMU_UPDATES 1024 struct xc_mmu { mmu_update_t updates[MAX_MMU_UPDATES]; --Boundary-00=_9lFQNEfdpjtas8a Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --Boundary-00=_9lFQNEfdpjtas8a--