# HG changeset patch
# User Christoph Egger <Christoph.Egger@xxxxxxx>
# Date 1296155022 0
# Node ID c80960244942ddd67595885354bfdc42d1562b22
# Parent 5222f128a83bfb26642a29dd0d9bbb82bd3330bb
libxc: break xc_get_physmem out into os-dependent files
NetBSD doesn't have sysconf(_SC_PHYS_PAGES).
Factor physmem() out into os-dependent files and rename it to
xc_get_physmem() so as not to pollute the namespace.
Signed-off-by: Christoph Egger <Christoph.Egger@xxxxxxx>
Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
tools/libxc/xc_dom_bzimageloader.c | 23 +----------------------
tools/libxc/xc_linux.c | 21 +++++++++++++++++++++
tools/libxc/xc_netbsd.c | 21 +++++++++++++++++++++
tools/libxc/xc_private.h | 3 +++
4 files changed, 46 insertions(+), 22 deletions(-)
diff -r 5222f128a83b -r c80960244942 tools/libxc/xc_dom_bzimageloader.c
--- a/tools/libxc/xc_dom_bzimageloader.c Thu Jan 27 18:59:07 2011 +0000
+++ b/tools/libxc/xc_dom_bzimageloader.c Thu Jan 27 19:03:42 2011 +0000
@@ -140,27 +140,6 @@ static int xc_try_bzip2_decode(
#include <lzma.h>
-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 5222f128a83b -r c80960244942 tools/libxc/xc_linux.c
--- a/tools/libxc/xc_linux.c Thu Jan 27 18:59:07 2011 +0000
+++ b/tools/libxc/xc_linux.c Thu Jan 27 19:03:42 2011 +0000
@@ -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 5222f128a83b -r c80960244942 tools/libxc/xc_netbsd.c
--- a/tools/libxc/xc_netbsd.c Thu Jan 27 18:59:07 2011 +0000
+++ b/tools/libxc/xc_netbsd.c Thu Jan 27 19:03:42 2011 +0000
@@ -23,6 +23,9 @@
#include <xen/sys/evtchn.h>
#include <unistd.h>
#include <fcntl.h>
+#include <stdio.h>
+#include <errno.h>
+#include <sys/sysctl.h>
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 5222f128a83b -r c80960244942 tools/libxc/xc_private.h
--- a/tools/libxc/xc_private.h Thu Jan 27 18:59:07 2011 +0000
+++ b/tools/libxc/xc_private.h Thu Jan 27 19:03:42 2011 +0000
@@ -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];
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home