[libvirt] [libvirt PATCH v2 14/44] Deprecate QEMU_CAPS_SDL

[Daniel P. Berrangé]

On Mon, Apr 09, 2018 at 05:20:07PM +0200, Ján Tomko wrote:
> Implied by QEMU >= 1.2.0.
> 
> Signed-off-by: Ján Tomko <jtomko at redhat.com>
> ---
>  src/qemu/qemu_capabilities.c                       | 4 +---
>  src/qemu/qemu_capabilities.h                       | 2 +-
>  src/qemu/qemu_command.c                            | 9 +--------
>  tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml   | 1 -
>  tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml   | 1 -
>  tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml   | 1 -
>  tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml   | 1 -
>  tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 -
>  tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml   | 1 -
>  tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml   | 1 -
>  tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml  | 1 -
>  tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml   | 1 -
>  tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 -
>  tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml   | 1 -
>  tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml   | 1 -
>  tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml  | 1 -
>  tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml   | 1 -
>  tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml   | 1 -
>  tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml  | 1 -
>  tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml    | 1 -
>  tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml   | 1 -
>  tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml    | 1 -
>  tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml   | 1 -
>  tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml    | 1 -
>  tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml   | 1 -
>  tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml    | 1 -
>  tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml    | 1 -
>  tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml   | 1 -
>  tests/qemuxml2argvtest.c                           | 4 ++--
>  29 files changed, 5 insertions(+), 39 deletions(-)
> 
> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
> index b4ead4aeff..63eb1a5768 100644
> --- a/src/qemu/qemu_capabilities.c
> +++ b/src/qemu/qemu_capabilities.c
> @@ -3635,7 +3635,6 @@ static qemuMonitorCallbacks callbacks = {
>  static void
>  virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
>  {
> -    virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL);
>      virQEMUCapsSet(qemuCaps, QEMU_CAPS_RTC);
>      virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOST_NET);
>      virQEMUCapsSet(qemuCaps, QEMU_CAPS_NODEFCONFIG);
> @@ -4693,8 +4692,7 @@ virQEMUCapsFillDomainDeviceGraphicsCaps(virQEMUCapsPtr qemuCaps,
>  {
>      dev->supported = true;
>  
> -    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SDL))
> -        VIR_DOMAIN_CAPS_ENUM_SET(dev->type, VIR_DOMAIN_GRAPHICS_TYPE_SDL);
> +    VIR_DOMAIN_CAPS_ENUM_SET(dev->type, VIR_DOMAIN_GRAPHICS_TYPE_SDL);
>      if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VNC))
>          VIR_DOMAIN_CAPS_ENUM_SET(dev->type, VIR_DOMAIN_GRAPHICS_TYPE_VNC);
>      if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SPICE))
> diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
> index 9d0b6878b7..71bea5a623 100644
> --- a/src/qemu/qemu_capabilities.h
> +++ b/src/qemu/qemu_capabilities.h
> @@ -85,7 +85,7 @@ typedef enum {
>      /* 25 */
>      X_QEMU_CAPS_BALLOON, /* -balloon available */
>      X_QEMU_CAPS_DEVICE, /* Is the -device arg available */
> -    QEMU_CAPS_SDL, /* Is the new -sdl arg available */
> +    X_QEMU_CAPS_SDL, /* Is the new -sdl arg available */

Hmm, even if -sdl is available, QEMU might have been built without SDL
support. I wonder if there is any way we can probe to see if SDL is
truely available....

>      X_QEMU_CAPS_SMP_TOPOLOGY, /* -smp has sockets/cores/threads */
>      X_QEMU_CAPS_NETDEV, /* -netdev flag & netdev_add/remove */
>  
> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
> index 422f8f2546..6851bd7bcf 100644
> --- a/src/qemu/qemu_command.c
> +++ b/src/qemu/qemu_command.c
> @@ -8134,18 +8134,11 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg,
>  static int
>  qemuBuildGraphicsCommandLine(virQEMUDriverConfigPtr cfg,
>                               virCommandPtr cmd,
> -                             virDomainDefPtr def,
>                               virQEMUCapsPtr qemuCaps,
>                               virDomainGraphicsDefPtr graphics)
>  {
>      switch (graphics->type) {
>      case VIR_DOMAIN_GRAPHICS_TYPE_SDL:
> -        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SDL)) {
> -            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
> -                           _("sdl not supported by '%s'"), def->emulator);
> -            return -1;
> -        }

...as this is potentially still relevant if built without SDL


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|