tools/libxl: Add qxl vga interface support for upstream qemu
PATCH v9 1/1 tools/libxl: Add qxl vga interface support for upstream qemu
From: Fabio Fantoni <[email protected]>
Usage:
vga="qxl"
Changes from v8:
- vga=qxl instead of qxl=1 to use it.
- Show an error and exit if vga="qxl" without qemu upstream.
- Other small improvements.
Required patches:
- Improve videoram setting v5
- Added vga parameter for hvm domUs
--- docs/man/xl.cfg.pod.5 | 10 +++++++++- tools/libxl/libxl_create.c | 17 +++++++++++++++++ tools/libxl/libxl_dm.c | 13 +++++++++++++ tools/libxl/libxl_types.idl | 1 + tools/libxl/xl_cmdimpl.c | 3 +++ 5 files changed, 43 insertions(+), 1 deletion(-)
docs/man/xl.cfg.pod.5 +9 -1
@@ -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
@@ -995,9 +998,14 @@ This option is deprecated, use vga="stdvga" instead. =item B<vga="STRING"> -Selects the emulated video card (stdvga|cirrus). +Selects the emulated video card (stdvga|cirrus|qxl). The default is cirrus. +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 +17 -0
@@ -197,6 +197,23 @@ 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->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->video_memkb ==LIBXL_MEMKB_DEFAULT ) b_info->video_memkb =8 *1024 ;else if (b_info->video_memkb <8192 ){
tools/libxl/libxl_dm.c +13 -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) {
@@ -440,6 +442,17 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, 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" , +libxl__sprintf (gc,"qxl-vga.vram_size_mb=%lu" , + (b_info->video_memkb/2 /1024 )),"-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 +3 -0
@@ -1476,6 +1476,9 @@ skip_vfb: }else if (!strcmp (buf,"cirrus" )) { b_info->u.hvm.vga.kind =LIBXL_VGA_INTERFACE_TYPE_CIRRUS ; + }else if (!strcmp (buf,"qxl" )) { + b_info->u.hvm.vga.kind + =LIBXL_VGA_INTERFACE_TYPE_QXL ; }else {fprintf (stderr,"Unknown vga \"%s\" specified\n" , buf);
Signature · 1 line
1.7.9.5
Quoted 10 lines · On Mon, 11 Feb 2013, [email protected] wrote:
From: Fabio Fantoni <[email protected]>
Usage:
vga="qxl"Changes from v8:
- vga=qxl instead of qxl=1 to use it.
- Show an error and exit if vga="qxl" without qemu upstream.
- Other small improvements.
Quoted 6 lines
Required patches:
- Improve videoram setting v5
- Added vga parameter for hvm domUsSigned-off-by Fabio Fantoni <[email protected]>Signed-off-by Zhou Peng <[email protected]>
Quoted 125 lines
docs/man/xl.cfg.pod.5 | 10 +++++++++- tools/libxl/libxl_create.c | 17 +++++++++++++++++ tools/libxl/libxl_dm.c | 13 +++++++++++++ tools/libxl/libxl_types.idl | 1 + tools/libxl/xl_cmdimpl.c | 3 +++ 5 files changed, 43 insertions(+), 1 deletion(-)docs/man/xl.cfg.pod.5 +9
-1@@ -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@@ -995,9 +998,14 @@ This option is deprecated, use vga="stdvga" instead. =item B<vga="STRING"> -Selects the emulated video card (stdvga|cirrus). +Selects the emulated video card (stdvga|cirrus|qxl). The default is cirrus. +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 thetools/libxl/libxl_create.c +17
-0@@ -197,6 +197,23 @@ 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->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->video_memkb ==LIBXL_MEMKB_DEFAULT ) b_info->video_memkb =8 *1024 ;else if (b_info->video_memkb <8192 ){tools/libxl/libxl_dm.c +13
-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) {@@ -440,6 +442,17 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, 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" , +libxl__sprintf (gc,"qxl-vga.vram_size_mb=%lu" , + (b_info->video_memkb/2 /1024 )),"-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 +3
-0@@ -1476,6 +1476,9 @@ skip_vfb: }else if (!strcmp (buf,"cirrus" )) { b_info->u.hvm.vga.kind =LIBXL_VGA_INTERFACE_TYPE_CIRRUS ; + }else if (!strcmp (buf,"qxl" )) { + b_info->u.hvm.vga.kind + =LIBXL_VGA_INTERFACE_TYPE_QXL ; }else {fprintf (stderr,"Unknown vga \"%s\" specified\n" , buf);Signature · 1 line
1.7.9.5
Quoted 11 lines · Stefano Stabellini
Quoted 10 lines · On Mon, 11 Feb 2013, [email protected] wrote:
From: Fabio Fantoni <[email protected]>
Usage:
vga="qxl"Changes from v8:
- vga=qxl instead of qxl=1 to use it.
- Show an error and exit if vga="qxl" without qemu upstream.
- Other small improvements.
Quoted 8 lines
Quoted 6 lines
Required patches:
- Improve videoram setting v5
- Added vga parameter for hvm domUsSigned-off-by Fabio Fantoni <[email protected]>Signed-off-by Zhou Peng <[email protected]>
Applied thanks
Il 15/02/2013 14:46, Ian Campbell ha scritto:
Quoted 12 lines · Stefano Stabellini
Quoted 11 lines · On Mon, 11 Feb 2013, [email protected] wrote:
Quoted 10 lines
From: Fabio Fantoni <[email protected]>
Usage:
vga="qxl"Changes from v8:
- vga=qxl instead of qxl=1 to use it.
- Show an error and exit if vga="qxl" without qemu upstream.
- Other small improvements.
Quoted 10 lines
Quoted 7 lines
Quoted 6 lines
Required patches:
- Improve videoram setting v5
- Added vga parameter for hvm domUsSigned-off-by Fabio Fantoni <[email protected]>Signed-off-by Zhou Peng <[email protected]>Applied thanks
I do not see this patch in the staging branch, there are problems of code style?
Quoted 17 lines · Fabio Fantoni
Il 15/02/2013 14:46, Ian Campbell ha scritto:
Quoted 16 lines · Stefano Stabellini
Quoted 15 lines · On Mon, 11 Feb 2013, [email protected] wrote:
Quoted 14 lines
From: Fabio Fantoni <[email protected]>
Usage:
vga="qxl"Changes from v8:
- vga=qxl instead of qxl=1 to use it.
- Show an error and exit if vga="qxl" without qemu upstream.
- Other small improvements.Required patches:
- Improve videoram setting v5
- Added vga parameter for hvm domUs
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
Quoted 2 lines
Signed-off-by Fabio Fantoni <[email protected]>Signed-off-by Zhou Peng <[email protected]>Applied thanks
I do not see this patch in the staging branch, there are problems of code style?
I think I just managed to miss actually applying this one in among all the other stuff I applied on Friday. I'll take another look next week.
Ian.
Ian Campbell writes ("Re: [Xen-devel] [PATCH v9] tools/libxl: Add qxl vga interface support for upstream qemu"):
Quoted 6 lines · Fabio Fantoni
Quoted 2 lines
I do not see this patch in the staging branch, there are problems of code style?
I think I just managed to miss actually applying this one in among all the other stuff I applied on Friday. I'll take another look next week.
I see this has an ack from Stefano, but I have made some comments on the coding style so I think we want a resend with those changes.
Fabio, would you please transfer the ack from Stefano's email into your resend ?
Thanks,
Ian.
PATCH v11 1/1 tools/libxl: Add qxl vga interface support for upstream qemu
From: Fabio Fantoni <[email protected]>
Usage:
vga="qxl"
Changes from v10:
- Some coding style fixes
--- docs/man/xl.cfg.pod.5 | 10 +++++++++- tools/libxl/libxl_create.c | 19 +++++++++++++++++-- tools/libxl/libxl_dm.c | 18 +++++++++++++++--- tools/libxl/libxl_types.idl | 1 + tools/libxl/xl_cmdimpl.c | 11 +++++------ 5 files changed, 47 insertions(+), 12 deletions(-)
docs/man/xl.cfg.pod.5 +9 -1
@@ -1003,6 +1003,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
@@ -1014,9 +1017,14 @@ This option is deprecated, use vga="stdvga" instead. =item B<vga="STRING"> -Selects the emulated video card (stdvga|cirrus). +Selects the emulated video card (stdvga|cirrus|qxl). The default is cirrus. +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 +17 -2
@@ -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 )
tools/libxl/libxl_dm.c +15 -3
@@ -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 ; }
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 +5 -6
@@ -1476,14 +1476,13 @@ skip_vfb:if (c_info->type ==LIBXL_DOMAIN_TYPE_HVM ) {if (!xlu_cfg_get_string (config,"vga" , &buf,0 )) {if (!strcmp (buf,"stdvga" )) { - b_info->u.hvm.vga.kind - =LIBXL_VGA_INTERFACE_TYPE_STD ; + b_info->u.hvm.vga.kind =LIBXL_VGA_INTERFACE_TYPE_STD ; }else if (!strcmp (buf,"cirrus" )) { - b_info->u.hvm.vga.kind - =LIBXL_VGA_INTERFACE_TYPE_CIRRUS ; + b_info->u.hvm.vga.kind =LIBXL_VGA_INTERFACE_TYPE_CIRRUS ; + }else if (!strcmp (buf,"qxl" )) { + b_info->u.hvm.vga.kind =LIBXL_VGA_INTERFACE_TYPE_QXL ; }else { -fprintf (stderr, -"Unknown vga \"%s\" specified\n" , buf); +fprintf (stderr,"Unknown vga \"%s\" specified\n" , buf);exit (1 ); } }else if (!xlu_cfg_get_long (config,"stdvga" , &l,0 ))
Signature · 1 line
1.7.9.5
Ian Jackson
AppliedRe: [PATCH v11] tools/libxl: Add qxl vga interface support for upstream qemu [and 1 more messages]
[email protected] writes ("[PATCH v11] tools/libxl: Add qxl vga interface support for upstream qemu"):
Quoted 4 lines
From: Fabio Fantoni <[email protected]>
Usage:
vga="qxl"
Applied, thanks.
Ian Jackson writes ("Re: [Xen-devel] [PATCH v9] tools/libxl: Add qxl vga interface support for upstream qemu"):
Quoted 2 lines
Fabio, would you please transfer the ack from Stefano's email into your resend ?
You didn't do this but I added it myself.
Thanks,
Ian.