diff options
author | Fabio Fantoni <fabio.fantoni@heliman.it> | 2013-02-20 15:46:06 +0000 |
---|---|---|
committer | Fabio Fantoni <fabio.fantoni@heliman.it> | 2013-02-20 15:46:06 +0000 |
commit | aab4d1b266ce9891a684704f6abf6a5f6b3f7c24 (patch) | |
tree | eb28d3b374e845e31ffbdfbf92a303849501babf /tools/libxl/libxl_create.c | |
parent | a5124f33995f7307b008b1a5c125537d58bed75e (diff) | |
download | xen-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_create.c')
-rw-r--r-- | tools/libxl/libxl_create.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index fa81f884d9..efeebf27fb 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -198,14 +198,29 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, if (b_info->shadow_memkb == LIBXL_MEMKB_DEFAULT) b_info->shadow_memkb = 0; + if (b_info->u.hvm.vga.kind == LIBXL_VGA_INTERFACE_TYPE_QXL) { + if (b_info->device_model_version == + LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) { + if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT) { + b_info->video_memkb = (128 * 1024); + } else if (b_info->video_memkb < (128 * 1024)) { + LOG(ERROR, + "128 Mib videoram is the minimum for qxl default"); + return ERROR_INVAL; + } + } else { + LOG(ERROR,"qemu upstream required for qxl vga"); + return ERROR_INVAL; + } + } + if (b_info->u.hvm.vga.kind == LIBXL_VGA_INTERFACE_TYPE_STD && b_info->device_model_version == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) { if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT) b_info->video_memkb = 16 * 1024; else if (b_info->video_memkb < (16 * 1024) ){ - LOG(ERROR, - "videoram must be at least 16 mb with stdvga"); + LOG(ERROR, "videoram must be at least 16 mb with stdvga"); return ERROR_INVAL; } } else if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT) |