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];