[Xen-changelog] [xen-unstable] libxenlight: fix two memory related issues

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1260521126 0
# Node ID 9575425fdebd1f5d3c218be4d8dbedc8b7e462ea
# Parent  5f076dbdab6ce9bcf079534fe61ef6866c4bc283
libxenlight: fix two memory related issues

- LIBXL_MAXMEM_CONSTANT is 1MB but must be expressed in KB;

- xc_dom_linux_build should take target_memkb instead of max_memkb as
  an argument.

Thanks to Andres for spotting the latter.

Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
---
 tools/libxl/libxl_dom.c      |    2 +-
 tools/libxl/libxl_internal.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff -r 5f076dbdab6c -r 9575425fdebd tools/libxl/libxl_dom.c
--- a/tools/libxl/libxl_dom.c   Fri Dec 11 08:44:33 2009 +0000
+++ b/tools/libxl/libxl_dom.c   Fri Dec 11 08:45:26 2009 +0000
@@ -130,7 +130,7 @@ int build_pv(struct libxl_ctx *ctx, uint
         XL_LOG_ERRNO(ctx, XL_LOG_ERROR, "xc_dom_allocate failed");
         return -1;
     }
-    if ((ret = xc_dom_linux_build(ctx->xch, dom, domid, info->max_memkb / 1024,
+    if ((ret = xc_dom_linux_build(ctx->xch, dom, domid, info->target_memkb / 
1024,
                                   info->kernel, info->u.pv.ramdisk, flags,
                                   state->store_port, &state->store_mfn,
                                   state->console_port, &state->console_mfn)) 
!= 0) {
diff -r 5f076dbdab6c -r 9575425fdebd tools/libxl/libxl_internal.h
--- a/tools/libxl/libxl_internal.h      Fri Dec 11 08:44:33 2009 +0000
+++ b/tools/libxl/libxl_internal.h      Fri Dec 11 08:45:26 2009 +0000
@@ -31,7 +31,7 @@
 #define LIBXL_DEVICE_MODEL_START_TIMEOUT 10
 #define LIBXL_XENCONSOLE_LIMIT 1048576
 #define LIBXL_XENCONSOLE_PROTOCOL "vt100"
-#define LIBXL_MAXMEM_CONSTANT (1 * 1024 * 1024)
+#define LIBXL_MAXMEM_CONSTANT 1024
 #define QEMU_SIGNATURE "QemuDeviceModelRecord"
 
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog