Re: [PATCH v12 1/8] tools: Add vga=vmware

[Ian Campbell <ian.campbell@citrix.com>]

On Sat, 2015-06-27 at 19:27 -0400, Don Slutz wrote:
> From: Don Slutz <dslutz@verizon.com>
> 
> This allows use of QEMU's VMware emulated video card
> 
> NOTE: vga=vmware is not supported by device_model_version=qemu-xen-traditional
> 
> Signed-off-by: Don Slutz <dslutz@verizon.com>
> CC: Don Slutz <don.slutz@gmail.com>

Acked-by: Ian Campbell <ian.campbell@citrix.com>

> ---
> v12:
>   Dropped LIBXL_HAVE_LIBXL_VGA_INTERFACE_TYPE_VMWARE
>   This means that the later patch that defines LIBXL_HAVE_VMWARE
>   is now also required.
> 
> v11:
>   Dropped support for Qemu-trad.
>   Also changed later patchs to not need this one.
> 
> v10: New at v10.
> 
>   Was part of "tools: Add vmware_hwver support"
> 
>  docs/man/xl.cfg.pod.5       | 4 +++-
>  tools/libxl/libxl_dm.c      | 9 +++++++++
>  tools/libxl/libxl_types.idl | 1 +
>  tools/libxl/xl_cmdimpl.c    | 2 ++
>  4 files changed, 15 insertions(+), 1 deletion(-)
> 
> diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5
> index a3e0e2e..84078f6 100644
> --- a/docs/man/xl.cfg.pod.5
> +++ b/docs/man/xl.cfg.pod.5
> @@ -1389,7 +1389,7 @@ This option is deprecated, use vga="stdvga" instead.
>  
>  =item B<vga="STRING">
>  
> -Selects the emulated video card (none|stdvga|cirrus|qxl).
> +Selects the emulated video card (none|stdvga|cirrus|qxl|vmware).
>  The default is cirrus.
>  
>  In general, QXL should work with the Spice remote display protocol
> @@ -1397,6 +1397,8 @@ 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.
>  
> +NOTE: vmware is not supported on B<device_model_version = "qemu-xen-traditional">
> +
>  =item B<vnc=BOOLEAN>
>  
>  Allow access to the display via the VNC protocol.  This enables the
> diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
> index 6b8b3ac..975996d 100644
> --- a/tools/libxl/libxl_dm.c
> +++ b/tools/libxl/libxl_dm.c
> @@ -256,6 +256,10 @@ static int libxl__build_device_model_args_old(libxl__gc *gc,
>          case LIBXL_VGA_INTERFACE_TYPE_NONE:
>              flexarray_append_pair(dm_args, "-vga", "none");
>              break;
> +        case LIBXL_VGA_INTERFACE_TYPE_VMWARE:
> +            LOG(ERROR, "vga=vmware is not supported by "
> +                "qemu-xen-traditional");
> +            return ERROR_INVAL;
>          case LIBXL_VGA_INTERFACE_TYPE_QXL:
>              break;
>          }
> @@ -657,6 +661,11 @@ static int libxl__build_device_model_args_new(libxl__gc *gc,
>                  GCSPRINTF("qxl-vga,vram_size_mb=%"PRIu64",ram_size_mb=%"PRIu64,
>                  (b_info->video_memkb/2/1024), (b_info->video_memkb/2/1024) ) );
>              break;
> +        case LIBXL_VGA_INTERFACE_TYPE_VMWARE:
> +            flexarray_append_pair(dm_args, "-device",
> +                GCSPRINTF("vmware-svga,vgamem_mb=%d",
> +                libxl__sizekb_to_mb(b_info->video_memkb)));
> +            break;
>          }
>  
>          if (b_info->u.hvm.boot) {
> diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl
> index 736c4e4..534e7f0 100644
> --- a/tools/libxl/libxl_types.idl
> +++ b/tools/libxl/libxl_types.idl
> @@ -187,6 +187,7 @@ libxl_vga_interface_type = Enumeration("vga_interface_type", [
>      (2, "STD"),
>      (3, "NONE"),
>      (4, "QXL"),
> +    (5, "VMWARE"),
>      ], init_val = "LIBXL_VGA_INTERFACE_TYPE_CIRRUS")
>  
>  libxl_vendor_device = Enumeration("vendor_device", [
> diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
> index 568fd21..efb3651 100644
> --- a/tools/libxl/xl_cmdimpl.c
> +++ b/tools/libxl/xl_cmdimpl.c
> @@ -2142,6 +2142,8 @@ skip_vfb:
>                  b_info->u.hvm.vga.kind = LIBXL_VGA_INTERFACE_TYPE_NONE;
>              } else if (!strcmp(buf, "qxl")) {
>                  b_info->u.hvm.vga.kind = LIBXL_VGA_INTERFACE_TYPE_QXL;
> +            } else if (!strcmp(buf, "vmware")) {
> +                b_info->u.hvm.vga.kind = LIBXL_VGA_INTERFACE_TYPE_VMWARE;
>              } else {
>                  fprintf(stderr, "Unknown vga \"%s\" specified\n", buf);
>                  exit(1);