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

[Markus Armbruster]

Daniel P. Berrangé <berrange@redhat.com> writes:

> On Thu, Dec 01, 2022 at 04:49:25PM +0100, Markus Armbruster wrote:
>> Daniel P. Berrangé <berrange@redhat.com> writes:
>> 
>> > On Thu, Dec 01, 2022 at 01:39:13PM +0100, Markus Armbruster wrote:

[...]

>> >> Would you like me to bump spice-server as well?  To which version?
>> >
>> > Yes, might as well, the spice-server versions are slightly different:
>> >
>> >      Debian 11: 0.14.3
>> >      RHEL-8: 0.14.3
>> >      FreeBSD (ports): 0.15.0
>> >      Fedora 35: 0.15.0
>> >      Ubuntu 20.04: 0.14.2
>> >      OpenSUSE Leap 15.3: 0.14.3
>> >  
>> > I think we might as well pick  0.14.0 for both protocol and server.
>> 
>> Makes sense, but it leads to another question.
>> 
>> I found obvious version checks for spice-protocol, and dropped the
>> outmoded ones, namely
>> 
>>     #if CHECK_SPICE_PROTOCOL_VERSION(0, 14, 0)
>> 
>> For spice-server, I see a bunch of SPICE_INTERFACE_FOO_{MAJOR,MINOR} we
>> check, and which ones become outmoded is not obvious to me.  Help?
>
> Ignore all the interface ones. For the server, the check to look
> for is against SPICE_SERVER_VERSION
>
> chardev/spice.c:#if SPICE_SERVER_VERSION >= 0x000c06
> chardev/spice.c:#if SPICE_SERVER_VERSION < 0x000e02
> hw/display/qxl.c:#if SPICE_SERVER_VERSION >= 0x000c06 && SPICE_SERVER_VERSION 
> < 0x000e02
> hw/display/qxl.c:#if SPICE_SERVER_VERSION >= 0x000c06 /* release 0.12.6 */
> hw/display/qxl.c:#if SPICE_SERVER_VERSION >= 0x000e02 /* release 0.14.2 */
> hw/display/qxl.c:#if SPICE_SERVER_VERSION >= 0x000c06 /* release 0.12.6 */
> hw/display/qxl.h:#if SPICE_SERVER_VERSION >= 0x000c06 /* release 0.12.6 */
> include/ui/qemu-spice.h:#if !defined(SPICE_SERVER_VERSION) || 
> (SPICE_SERVER_VERSION < 0xc06)
> include/ui/qemu-spice.h:#if defined(SPICE_SERVER_VERSION) && 
> (SPICE_SERVER_VERSION >= 0x000f00)
> include/ui/spice-display.h:# if SPICE_SERVER_VERSION >= 0x000d01 /* release 
> 0.13.1 */
> ui/spice-display.c:#if SPICE_SERVER_VERSION >= 0x000e04 /* release 0.14.4 */
> ui/spice-display.c:#if SPICE_SERVER_VERSION >= 0x000e02 /* release 0.14.2 */
>
> A fair few of those will be obsolete

Got it, thanks!