[Spice-devel] [PATCH spice-server] cursor-channel: Remove obsolete size check

[Victor Toso]

Hi,

On Mon, May 22, 2017 at 11:41:02AM +0100, Frediano Ziglio wrote:
> In the past CursorItem structure was stored in
> RedCursorCmd::device_data field so the check was there to check if the
> structure fit into that field.
> Since 2ba69f9f8819daaa3d166c4c1c7e03b121b88a95

A lit bit hard to follow, this one

> ("libspice: add surface 0 support") the structure is no more stored in
> the field so there's no reason for this check causing only confusion.
>
> Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
> ---
>  server/cursor-channel.c | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/server/cursor-channel.c b/server/cursor-channel.c
> index 6aea64a..a876113 100644
> --- a/server/cursor-channel.c
> +++ b/server/cursor-channel.c
> @@ -34,8 +34,6 @@ typedef struct CursorItem {
>      RedCursorCmd *red_cursor;
>  } CursorItem;
>
> -G_STATIC_ASSERT(sizeof(CursorItem) <= QXL_CURSUR_DEVICE_DATA_SIZE);
> -

I don't see any other use for QXL_CURSUR_DEVICE_DATA_SIZE in my local
workspace besides:

  spice-protocol/spice/qxl_dev.h:335:
  #define QXL_CURSUR_DEVICE_DATA_SIZE 128
  spice-protocol/spice/qxl_dev.h:352:
  uint8_t device_data[QXL_CURSUR_DEVICE_DATA_SIZE]; //todo: dynamic size from rom

Is that useless now?

(hmm, checking qxl-wddm-dod)
[0] https://gitlab.com/spice/qxl-wddm-dod

Okay, here is also not used and header is actually duplicated (shouldn't
we use the header from spice-protocol here? see:

  $ qxl-wddm-dod (master 1a81d6d3) $ grepi "qxl_dev" *
  qxldod/include/qxl_dev.h:32:#ifndef _H_QXL_DEV
  qxldod/include/qxl_dev.h:33:#define _H_QXL_DEV
  qxldod/include/qxl_dev.h:65:#define QXL_DEVICE_ID_STABLE 0x0100
  qxldod/include/qxl_dev.h:74:#define QXL_DEVICE_ID_DEVEL 0x01ff
  qxldod/include/qxl_dev.h:808:#endif /* _H_QXL_DEV */
  qxldod/QxlDod.h:13:#include "qxl_dev.h"

Anyway, patch looks fine but we might want to do some follow ups.

>  struct CursorChannel
>  {
>      CommonGraphicsChannel parent;
> -- 
> 2.9.4
> 
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/spice-devel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/spice-devel/attachments/20170522/c8acab6f/attachment.sig>