aboutsummaryrefslogtreecommitdiffstats
path: root/tools/libxl/libxl_dm.c
diff options
context:
space:
mode:
authorFabio Fantoni <fabio.fantoni@heliman.it>2013-02-20 15:46:06 +0000
committerFabio Fantoni <fabio.fantoni@heliman.it>2013-02-20 15:46:06 +0000
commitaab4d1b266ce9891a684704f6abf6a5f6b3f7c24 (patch)
treeeb28d3b374e845e31ffbdfbf92a303849501babf /tools/libxl/libxl_dm.c
parenta5124f33995f7307b008b1a5c125537d58bed75e (diff)
downloadxen-aab4d1b266ce9891a684704f6abf6a5f6b3f7c24.tar.gz
xen-aab4d1b266ce9891a684704f6abf6a5f6b3f7c24.tar.bz2
xen-aab4d1b266ce9891a684704f6abf6a5f6b3f7c24.zip
libxl: Add qxl vga interface support for upstream qemu
Usage: vga="qxl" Signed-off-by: Fabio Fantoni <fabio.fantoni@heliman.it> Signed-off-by: Zhou Peng <zpengxen@gmail.com> Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools/libxl/libxl_dm.c')
-rw-r--r--tools/libxl/libxl_dm.c18
1 files changed, 15 insertions, 3 deletions
diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
index a2c99bd124..c4ca11eb90 100644
--- a/tools/libxl/libxl_dm.c
+++ b/tools/libxl/libxl_dm.c
@@ -181,6 +181,8 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc,
break;
case LIBXL_VGA_INTERFACE_TYPE_CIRRUS:
break;
+ case LIBXL_VGA_INTERFACE_TYPE_QXL:
+ break;
}
if (b_info->u.hvm.boot) {
@@ -435,9 +437,19 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc,
flexarray_vappend(dm_args, "-vga", "cirrus", NULL);
if (b_info->video_memkb) {
flexarray_vappend(dm_args, "-global",
- libxl__sprintf(gc, "vga.vram_size_mb=%d",
- libxl__sizekb_to_mb(b_info->video_memkb)),
- NULL);
+ GCSPRINTF("vga.vram_size_mb=%d",
+ libxl__sizekb_to_mb(b_info->video_memkb)), NULL);
+ }
+ break;
+ case LIBXL_VGA_INTERFACE_TYPE_QXL:
+ /* QXL have 2 ram regions, ram and vram */
+ flexarray_vappend(dm_args, "-vga", "qxl", NULL);
+ if (b_info->video_memkb) {
+ flexarray_vappend(dm_args, "-global",
+ GCSPRINTF("qxl-vga.vram_size_mb=%lu",
+ (b_info->video_memkb/2/1024)), "-global",
+ GCSPRINTF("qxl-vga.ram_size_mb=%lu",
+ (b_info->video_memkb/2/1024)), NULL);
}
break;
}