From: Anthony PERARD <anthony.perard@citrix.com>
Date: Tue, 3 Apr 2012 17:15:11 +0000 (+0100)
Subject: libxl: Pass actual RAM amount to qemu-xen
X-Git-Tag: 4.2.0-rc1~534
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ccd266a2e7c6bb47a7311af3bc05f54f1572429c;p=xen.git

libxl: Pass actual RAM amount to qemu-xen

QEMU upstream need to kown the amount of RAM given to a guest. This patch give
the correct value.

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
---

diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
index f1ad4010be..7bf653ac12 100644
--- a/tools/libxl/libxl_dm.c
+++ b/tools/libxl/libxl_dm.c
@@ -323,6 +323,7 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc,
     const char *keymap = dm_keymap(guest_config);
     flexarray_t *dm_args;
     int i;
+    uint64_t ram_size;
 
     dm_args = flexarray_make(16, 1);
     if (!dm_args)
@@ -504,11 +505,9 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc,
         break;
     }
 
-    /* RAM Size */
+    ram_size = libxl__sizekb_to_mb(b_info->max_memkb - b_info->video_memkb);
     flexarray_append(dm_args, "-m");
-    flexarray_append(dm_args,
-                     libxl__sprintf(gc, "%d",
-                                    libxl__sizekb_to_mb(b_info->target_memkb)));
+    flexarray_append(dm_args, libxl__sprintf(gc, "%"PRId64, ram_size));
 
     if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) {
         for (i = 0; i < num_disks; i++) {