tools/libxl: Add qxl vga interface support for upstream-qemu-xen.
PATCH v8 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 v7:
- Fix videoram settings parameters for qemu.
--- 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_mb=%lu" , + (b_info->video_memkb/2 /1024 )), +NULL ); +flexarray_vappend (dm_args,"-global" , +libxl__sprintf (gc,"qxl-vga.ram_size_mb=%lu" , + (b_info->video_memkb/2 /1024 )), +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
Quoted 11 lines · Fabio Fantoni
tools/libxl: Add qxl vga interface support for
upstream-qemu-xen.Usage:
qxl=1|0Changes from v7:
- Fix videoram settings parameters for qemu.Signed-off-by Fabio Fantoni <[email protected]>Signed-off-by Zhou Peng <[email protected]>
Unfortunately this patch is whitespace damaged in various places.
Quoted 28 lines
--- 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 +0
-0@@ -984,6 +984,9 @@ the amount of video ram is fixed at 4MB which issufficient
for 1024x768 at 32 bpp and videoram option is currently working only when using the upstream qemu-xen device-model.docs/man/xl.cfg.pod.5 +3
-0+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 guestsupports 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.
Quoted 1 line
+=item B<qxl=BOOLEAN>
What happens if I give qxl=1 and stdvga=1?
Perhaps we should deprecate stdvga and add a new option:
vga = "stdvga|cirrus|qxl"
?
docs/man/xl.cfg.pod.5 a Cirrus Logic GD5446 VGA card. If your guest supports VBE 2.0 or · line 1002
Quoted 4 lines
docs/man/xl.cfg.pod.5 +4
-0+ +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.
Do we have any docs on where to obtain this driver and how to install it? On the wiki perhaps, a link would be useful.
Quoted 17 lines
docs/man/xl.cfg.pod.5 +3
-0+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 thetools/libxl/libxl_create.c +2
-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
tools/libxl/libxl_create.c int libxl__domain_build_info_setdefault(libxl__gc *gc, · line 207
Quoted 6 lines
tools/libxl/libxl_create.c +6
-0+ && 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" );
You can use the LOG() macros to shorten this line (and in other places including you videoram patch too).
Should this error out on qemu == traditional and vga == QXL?
Quoted 12 lines
tools/libxl/libxl_create.c +4
-0+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 +0
-0
tools/libxl/libxl_dm.c static char ** · line 444
Quoted 6 lines
tools/libxl/libxl_dm.c +2
-0@@ -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 );
flexarray_append_pair() ?
tools/libxl/libxl_dm.c static char ** libxl__build_device_model_args_new(libxl__gc *gc, · line 452
Quoted 9 lines
tools/libxl/libxl_dm.c +9
-0+if (b_info->video_memkb) { +flexarray_vappend (dm_args,"-global" , +libxl__sprintf (gc,"qxl-vga.vram_size_mb=%lu" , + (b_info->video_memkb/2 /1024 )), +NULL ); +flexarray_vappend (dm_args,"-global" , +libxl__sprintf (gc,"qxl-vga.ram_size_mb=%lu" , + (b_info->video_memkb/2 /1024 )), +NULL );
You could combine the second two vappends into a single one, or use flexarray_append_pair().
The /2 is because the videomem is split between vram and ram? A comment to that affect would be useful.
Quoted 18 lines
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 ;
Quoted 7 lines · Ian Campbell
Quoted 6 lines · Fabio Fantoni
tools/libxl: Add qxl vga interface support for
upstream-qemu-xen.Usage:
qxl=1|0
Quoted 7 lines
Quoted 5 lines
Changes from v7:
- Fix videoram settings parameters for qemu.Signed-off-by Fabio Fantoni <[email protected]>Signed-off-by Zhou Peng <[email protected]>Unfortunately this patch is whitespace damaged in various places.
BTW you can find a simple doc here that explains how to send patches to mailing lists:
http://www.kernel.org/doc/Documentation/SubmittingPatches
the first part is a bit out-of-date: nowadays you would use "hg diff" or "git diff" to generate your patches.
Quoted 8 lines · Stefano Stabellini
BTW you can find a simple doc here that explains how to send patches to mailing lists:
http://www.kernel.org/doc/Documentation/SubmittingPatches
the first part is a bit out-of-date: nowadays you would use "hg diff" or "git diff" to generate your patches.
There's information about sending patch series with hg here:
http://wiki.xen.org/wiki/Submitting_Xen_Patches
If you're using git, "git email" is the most convenient thing to use.
-George
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel
Il 05/02/2013 11:33, Ian Campbell ha scritto:
Quoted 7 lines · Fabio Fantoni
Quoted 6 lines
tools/libxl: Add qxl vga interface support for
upstream-qemu-xen.Usage:
qxl=1|0
Quoted 6 lines
Quoted 5 lines
Changes from v7:
- Fix videoram settings parameters for qemu.Signed-off-by Fabio Fantoni <[email protected]>Signed-off-by Zhou Peng <[email protected]>Unfortunately this patch is whitespace damaged in various places.
I'll try from linux instead windows, I can also add patches as attachment on next messages?
Quoted 28 lines
Quoted 28 lines
--- 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 +0
-0@@ -984,6 +984,9 @@ the amount of video ram is fixed at 4MB which issufficient
for 1024x768 at 32 bpp and videoram option is currently working only when using the upstream qemu-xen device-model.docs/man/xl.cfg.pod.5 +3
-0+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 guestsupports 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.
Quoted 6 lines
Quoted 1 line
+=item B<qxl=BOOLEAN>
What happens if I give qxl=1 and stdvga=1?
Perhaps we should deprecate stdvga and add a new option:
vga = "stdvga|cirrus|qxl"
?
Yes that should be nice.
I'll do a patch that remove stdvga option and add vga option.
Quoted 33 lines
docs/man/xl.cfg.pod.5 a Cirrus Logic GD5446 VGA card. If your guest supports VBE 2.0 or · line 1002
Quoted 4 lines
docs/man/xl.cfg.pod.5 +4
-0+ +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.Do we have any docs on where to obtain this driver and how to install it? On the wiki perhaps, a link would be useful.
Quoted 17 lines
docs/man/xl.cfg.pod.5 +3
-0+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 thetools/libxl/libxl_create.c +2
-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_XENtools/libxl/libxl_create.c int libxl__domain_build_info_setdefault(libxl__gc *gc, · line 207
Quoted 6 lines
tools/libxl/libxl_create.c +6
-0+ && 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" );You can use the
LOG()macros to shorten this line (and in other places including you videoram patch too).
Quoted 1 line
Should this error out on qemu == traditional and vga == QXL?
Must I only replace LIBXL__LOG with LOG?
I'll add error and exit if vga=qxl and qemu is traditional.
Quoted 28 lines
Quoted 12 lines
tools/libxl/libxl_create.c +4
-0+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 +0
-0tools/libxl/libxl_dm.c static char ** · line 444
Quoted 6 lines
tools/libxl/libxl_dm.c +2
-0@@ -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 );
flexarray_append_pair()?tools/libxl/libxl_dm.c static char ** libxl__build_device_model_args_new(libxl__gc *gc, · line 452
Quoted 9 lines
tools/libxl/libxl_dm.c +9
-0+if (b_info->video_memkb) { +flexarray_vappend (dm_args,"-global" , +libxl__sprintf (gc,"qxl-vga.vram_size_mb=%lu" , + (b_info->video_memkb/2 /1024 )), +NULL ); +flexarray_vappend (dm_args,"-global" , +libxl__sprintf (gc,"qxl-vga.ram_size_mb=%lu" , + (b_info->video_memkb/2 /1024 )), +NULL );
Quoted 5 lines
You could combine the second two vappends into a single one, or use
flexarray_append_pair().The /2 is because the videomem is split between vram and ram? A comment to that affect would be useful.
I'll try to use flexarray_append_pair() instead. I'll also add small comment about 2 qxl ram regions.
Quoted 18 lines
Quoted 18 lines
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 ;
Quoted 10 lines
Quoted 1 line
-----
Nessun virus nel messaggio.
Controllato da AVG - www.avg.com
Versione: 2013.0.2897 / Database dei virus: 2639/6080 - Data di rilascio: 04/02/2013
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel
Quoted 11 lines · Fabio Fantoni
Il 05/02/2013 11:33, Ian Campbell ha scritto:
Quoted 10 lines · Fabio Fantoni
Quoted 9 lines
tools/libxl: Add qxl vga interface support for
upstream-qemu-xen.Usage:
qxl=1|0Changes from v7:
- Fix videoram settings parameters for qemu.
Quoted 6 lines
Quoted 3 lines
Quoted 2 lines
Signed-off-by Fabio Fantoni <[email protected]>Signed-off-by Zhou Peng <[email protected]>Unfortunately this patch is whitespace damaged in various places.
I'll try from linux instead windows, I can also add patches as attachment on next messages?
If sending from Linux doesn't work *then* lets try attachments.
Quoted 32 lines
Quoted 32 lines
Quoted 29 lines
--- 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 +0
-0@@ -984,6 +984,9 @@ the amount of video ram is fixed at 4MB which issufficient
for 1024x768 at 32 bpp and videoram option is currently working only when using the upstream qemu-xen device-model.docs/man/xl.cfg.pod.5 +3
-0+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 guestsupports 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.Quoted 1 line
+=item B<qxl=BOOLEAN>
What happens if I give qxl=1 and stdvga=1?
Quoted 6 lines
Quoted 3 lines
Perhaps we should deprecate stdvga and add a new option:
vga = "stdvga|cirrus|qxl"
?Yes that should be nice.
I'll do a patch that remove stdvga option and add vga option.
Please keep the stdvga as a (deprecated) synonym for vga=stdvga, so that configuration files are forward compatible.
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
docs/man/xl.cfg.pod.5 +2
-0+ + if (b_info->device_model_version ==
LIBXL_DEVICE_MODEL_VERSION_QEMU_XENdocs/man/xl.cfg.pod.5 +6
-0+ && 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");
Quoted 6 lines
Quoted 4 lines
You can use the
LOG()macros to shorten this line (and in other places including you videoram patch too).Should this error out on qemu == traditional and vga == QXL?
Must I only replace
LIBXL__LOGwith LOG?
LOG is just a convenience macro.
LIBXL__LOG(CTX, LIBXL__LOG_ERROR, ... ) becomes LOG(ERROR, ...)
Quoted 1 line
I'll add error and exit if vga=qxl and qemu is traditional.
Great. Remember that libxl can't exit(2), so it should return an error which causes xl to exit.