tools/libxl: Add qxl vga interface support for upstream-qemu-xen.
PATCH v7 1/1 tools/libxl: Add qxl vga interface support for upstream-qemu-xen.
tools/libxl: Add qxl vga interface support for
upstream-qemu-xen.
Usage:
qxl=1|0
Changes from v6:
- Some improvements.
This patch is based on staging branch updated today with also this patch applied:tools/libxl: Improve videoram setting
Signed-off-by Fabio Fantoni <[email protected]>
Signed-off-by Zhou Peng <[email protected]>
--- docs/man/xl.cfg.pod.5 | 11 +++++++++++ tools/libxl/libxl_create.c | 12 ++++++++++++ tools/libxl/libxl_dm.c | 15 +++++++++++++++ tools/libxl/libxl_types.idl | 1 + tools/libxl/xl_cmdimpl.c | 7 ++++++- 5 files changed, 45 insertions(+), 1 deletion(-)
docs/man/xl.cfg.pod.5 +11 -0
@@ -984,6 +984,9 @@ the amount of video ram is fixed at 4MB which is sufficient for 1024x768 at 32 bpp and videoram option is currently working only when using the upstream qemu-xen device-model. +For B<qxl> vga, the default is both default and minimal 128MB. +If B<videoram> is set less than 128MB, an error will be triggered. + =item B<stdvga=BOOLEAN> Select a standard VGA card with VBE (VESA BIOS Extensions) as the
@@ -992,6 +995,14 @@ a Cirrus Logic GD5446 VGA card. If your guest supports VBE 2.0 or later (e.g. Windows XP onwards) then you should enable this. stdvga supports more video ram and bigger resolutions than Cirrus. +=item B<qxl=BOOLEAN> + +Select a QXL VGA card as the emulated graphics device. +In general, QXL should work with the Spice remote display protocol +for acceleration, and QXL driver is necessary in guest in this case. +QXL can also work with the VNC protocol, but it will be like a standard +VGA without acceleration. + =item B<vnc=BOOLEAN> Allow access to the display via the VNC protocol. This enables the
tools/libxl/libxl_create.c +12 -0
@@ -197,6 +197,18 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc,case LIBXL_DOMAIN_TYPE_HVM :if (b_info->shadow_memkb ==LIBXL_MEMKB_DEFAULT ) b_info->shadow_memkb =0 ; + +if (b_info->device_model_version ==LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN + && b_info->u.hvm.vga.kind ==LIBXL_VGA_INTERFACE_TYPE_QXL ) { +if (b_info->video_memkb ==LIBXL_MEMKB_DEFAULT ) { + b_info->video_memkb = (128 *1024 ); + }else if (b_info->video_memkb < (128 *1024 )) { +LIBXL__LOG (CTX ,LIBXL__LOG_ERROR , +"128 Mib videoram is the minimum for qxl default" ); +return ERROR_INVAL ; + } + } +if (b_info->video_memkb ==LIBXL_MEMKB_DEFAULT ) b_info->video_memkb =8 *1024 ;else if (b_info->video_memkb <8192 ){
tools/libxl/libxl_dm.c +15 -0
@@ -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) {
@@ -437,6 +439,19 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, NULL); }break ; +case LIBXL_VGA_INTERFACE_TYPE_QXL : +flexarray_vappend (dm_args,"-vga" ,"qxl" ,NULL ); +if (b_info->video_memkb) { +flexarray_vappend (dm_args,"-global" , +libxl__sprintf (gc,"qxl-vga.vram_size=%lu" , + (b_info->video_memkb/2 )), +NULL ); +flexarray_vappend (dm_args,"-global" , +libxl__sprintf (gc,"qxl-vga.ram_size=%lu" , + (b_info->video_memkb/2 )), +NULL ); + } +break ; }if (b_info->u.hvm.boot) {
tools/libxl/libxl_types.idl +1 -0
@@ -130,6 +130,7 @@ libxl_shutdown_reason = Enumeration("shutdown_reason", [ libxl_vga_interface_type = Enumeration("vga_interface_type", [ (1, "CIRRUS"), (2, "STD"), + (3, "QXL"), ], init_val = 0) #
tools/libxl/xl_cmdimpl.c +6 -1
@@ -1469,7 +1469,12 @@ skip_vfb:#undef parse_extra_argsif (c_info->type ==LIBXL_DOMAIN_TYPE_HVM ) { -if (!xlu_cfg_get_long (config,"stdvga" , &l,0 )) +if (!xlu_cfg_get_long (config,"qxl" , &l,0 )) + b_info->u.hvm.vga.kind = l ?LIBXL_VGA_INTERFACE_TYPE_QXL : +LIBXL_VGA_INTERFACE_TYPE_CIRRUS ; + +if (!xlu_cfg_get_long (config,"stdvga" , &l,0 ) && + b_info->u.hvm.vga.kind !=LIBXL_VGA_INTERFACE_TYPE_QXL ) b_info->u.hvm.vga.kind = l ? LIBXL_VGA_INTERFACE_TYPE_STD :
LIBXL_VGA_INTERFACE_TYPE_CIRRUS;
Signature · 1 line
1.7.9.5
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel