[Spice-devel] [PATCH xf86-video-qxl] Adjust xspice_wakeup_handler() prototype for building xspice with server 1.19

[Hans de Goede]

Hi,

On 03-10-16 12:04, Christophe Fergeau wrote:
>
>
> On Thu, Sep 29, 2016 at 01:03:01PM +0200, Hans de Goede wrote:
>> Signed-off-by: Hans de Goede <hdegoede at redhat.com>
>> ---
>>  src/spiceqxl_main_loop.c | 4 ++++
>>  1 file changed, 4 insertions(+)
>>
>> diff --git a/src/spiceqxl_main_loop.c b/src/spiceqxl_main_loop.c
>> index db89b6d..0ac1f3e 100644
>> --- a/src/spiceqxl_main_loop.c
>> +++ b/src/spiceqxl_main_loop.c
>> @@ -330,7 +330,11 @@ static int no_write_watches(Ring *w)
>>      return 1;
>>  }
>>
>> +#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
>
> We have an occurrence of
> #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
> I'd use this here too to stay consistent (I assume they are equivalent
> here).
>
> Acked-by: Christophe Fergeau <cfergeau at redhat.com>

Sorry, but this patch turns out to be incomplete, self NACK.

I just saw that spiceqxl_main_loop also uses a BlockHandler
(xspice_block_handler) and expects to be able to add
fds to watch for read activity through the xserver mainloop
by treating the 3th argument as a FD_SET.

This is no longer supported as of xserver 1.19, instead
the new NotifyFD functionality should be used. The advantage
of this is that it can also properly watch fds for them
becoming ready for writing.

For an example patch of how to use the new NotifyFD
functionality see the recent tigervnc patch to make
tigervnc work with 1.19:

https://lists.x.org/archives/xorg-devel/2016-October/051482.html

Regards,

Hans