Re: [PATCH 3/9] ui: Drop disabled code for SPICE_CHANNEL_WEBDAV

[Daniel P . Berrangé]

On Thu, Dec 01, 2022 at 07:13:05AM +0100, Markus Armbruster wrote:
> HMP "info spice" has a bit of code to show channel type
> SPICE_CHANNEL_WEBDAV as "webdav", disabled since commit 7c6044a94e
> "hmp: info spice: take out webdav" (v2.3.0), because it compiles only
> with Spice versions 0.12.7 and later.  Our minimum version is 0.12.5.

Last version bump was 4 years ago

commit 1b63665c2c0e0d52735e0dd5217f109fe0dd2322
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date:   Wed Nov 28 19:59:32 2018 +0400

    configure: bump spice-server required version to 0.12.5

    ...snip....

    According to repology, all the distros that are build target platforms
    for QEMU include it:
    
          RHEL-7: 0.14.0
          Debian (Stretch): 0.12.8
          Debian (Jessie): 0.12.5
          FreeBSD (ports): 0.14.0
          OpenSUSE Leap 15: 0.14.0
          Ubuntu (Xenial): 0.12.6

We moved on from Debian and RHEL since then

   Debian 11: 0.14.3
   RHEL-8: 0.14.2
   FreeBSD (ports): 0.14.4
   Fedora 35: 0.14.0
   Ubuntu 20.04: 0.14.0
   OpenSUSE Leap 15.3: 0.14.3

IOW, we can bump to 0.14.0, and then revert the
webdav conditional commit.

> 
> Looks like nobody minded in more than seven years.  Drop it, so that
> checkpatch.pl won't complain when I move the code.
> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  monitor/hmp-cmds.c | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
> index a7c9ae2520..86dd961462 100644
> --- a/monitor/hmp-cmds.c
> +++ b/monitor/hmp-cmds.c
> @@ -626,12 +626,6 @@ void hmp_info_spice(Monitor *mon, const QDict *qdict)
>          [SPICE_CHANNEL_SMARTCARD] = "smartcard",
>          [SPICE_CHANNEL_USBREDIR] = "usbredir",
>          [SPICE_CHANNEL_PORT] = "port",
> -#if 0
> -        /* minimum spice-protocol is 0.12.3, webdav was added in 0.12.7,
> -         * no easy way to #ifdef (SPICE_CHANNEL_* is a enum).  Disable
> -         * as quick fix for build failures with older versions. */
> -        [SPICE_CHANNEL_WEBDAV] = "webdav",
> -#endif
>      };
>  
>      info = qmp_query_spice(NULL);
> -- 
> 2.37.3
> 
> 

With 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 :|