From 0ff9fffaa69d6abfb895a9867fe68d7efb51ed98 Mon Sep 17 00:00:00 2001 From: Anthony PERARD Date: Thu, 6 Jan 2011 14:27:33 +0000 Subject: [PATCH] libxl: Specify the target ram size to Qemu (new) when calling it This patch adds target_ram in device_model_info structure, to be used in libxl_build_device_model_args_new. Qemu upstream needs to know about it. It introduces also libxl__sizekb_to_mb to convert size from KB to MB by rounding up the result. Signed-off-by: Anthony PERARD Signed-off-by: Ian Jackson --- tools/libxl/libxl.c | 4 ++++ tools/libxl/libxl.idl | 1 + tools/libxl/libxl_utils.h | 4 ++++ tools/libxl/xl_cmdimpl.c | 3 ++- 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 2c3fb0f72f..6caa147bfd 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1390,6 +1390,10 @@ static char ** libxl_build_device_model_args_new(libxl__gc *gc, else flexarray_set(dm_args, num++, "xenfv"); + /* RAM Size */ + flexarray_set(dm_args, num++, "-m"); + flexarray_set(dm_args, num++, libxl__sprintf(gc, "%d", info->target_ram)); + if (info->type == XENFV) { disks = libxl_device_disk_list(libxl__gc_owner(gc), info->domid, &nb); for (i; i < nb; i++) { diff --git a/tools/libxl/libxl.idl b/tools/libxl/libxl.idl index 81fcfd9a50..e6a8805584 100644 --- a/tools/libxl/libxl.idl +++ b/tools/libxl/libxl.idl @@ -140,6 +140,7 @@ libxl_device_model_info = Struct("device_model_info",[ ("device_model", string), ("saved_state", string), ("type", libxl_qemu_machine_type), + ("target_ram", uint32), ("videoram", integer, False, "size of the videoram in MB"), ("stdvga", bool, False, "stdvga enabled or disabled"), ("vnc", bool, False, "vnc enabled or disabled"), diff --git a/tools/libxl/libxl_utils.h b/tools/libxl/libxl_utils.h index 075197e4cb..3ec67e5eb0 100644 --- a/tools/libxl/libxl_utils.h +++ b/tools/libxl/libxl_utils.h @@ -85,5 +85,9 @@ void libxl_cpumap_reset(libxl_cpumap *cpumap, int cpu); int libxl_cpuarray_alloc(libxl_ctx *ctx, libxl_cpuarray *cpuarray); +static inline uint32_t libxl__sizekb_to_mb(uint32_t s) { + return (s + 1023) / 1024; +} + #endif diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 9d55259bdf..b7d3050738 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -359,7 +359,8 @@ static void init_dm_info(libxl_device_model_info *dm_info, dm_info->dom_name = strdup(c_info->name); dm_info->device_model = strdup("qemu-dm"); - dm_info->videoram = b_info->video_memkb / 1024; + dm_info->target_ram = libxl__sizekb_to_mb(b_info->target_memkb); + dm_info->videoram = libxl__sizekb_to_mb(b_info->video_memkb); dm_info->apic = b_info->u.hvm.apic; dm_info->vcpus = b_info->max_vcpus; dm_info->vcpu_avail = b_info->cur_vcpus; -- 2.39.5