[Spice-commits] 2 commits - common/messages.h spice.proto

[GitLab Mirror]

 common/messages.h |    9 ---------
 spice.proto       |    4 ++--
 2 files changed, 2 insertions(+), 11 deletions(-)

New commits:
commit 47e149705a5bb1d4a615facfd9bd0190d9b0647c
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Thu Apr 2 13:19:03 2020 +0100

    proto: Generate correct constants for smartcard support
    
    Of all SPICE_MSGC_SMARTCARD_xxx constants only SPICE_MSGC_SMARTCARD_DATA
    is used by both spice-gtk and spice-server.
    Generate the right constant, all obsolete ones will not be generated.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Victor Toso <victortoso at redhat.com>

diff --git a/spice.proto b/spice.proto
index 2042754..db86696 100644
--- a/spice.proto
+++ b/spice.proto
@@ -1302,14 +1302,14 @@ channel SmartcardChannel : BaseChannel {
         case Error:
             VscMessageError error;
         } u @anon;
-    } @ctype(SpiceMsgcSmartcard) data = 101;
+    } @ctype(SpiceMsgcSmartcard) old_data = 101;
 */
     message {
         vsc_message_type type;
         uint32 reader_id;
         uint32 length;
         uint8 data[length] @end @nomarshal;
-    } @ctype(VSCMsgHeader) header = 101;
+    } @ctype(VSCMsgHeader) data = 101;
 /* See comment on client data message above */
 /*
     message {
commit 81f0331469e906401bb8ef7b2b815877d298071c
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Thu Apr 2 13:17:25 2020 +0100

    messages: Remove obsolete structure definition
    
    This structure is not used by both spice-gtk and spice-server.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Victor Toso <victortoso at redhat.com>

diff --git a/common/messages.h b/common/messages.h
index 5cda1d1..8bc2708 100644
--- a/common/messages.h
+++ b/common/messages.h
@@ -58,15 +58,6 @@ typedef struct SpiceMsgSmartcard {
     uint32_t reader_id;
     uint8_t data[0];
 } SpiceMsgSmartcard;
-
-typedef struct SpiceMsgcSmartcard {
-    VSCMsgHeader header;
-    union {
-        VSCMsgError error;
-        VSCMsgATR atr_data;
-        VSCMsgReaderAdd add;
-    };
-} SpiceMsgcSmartcard;
 #endif
 
 #include <common/generated_messages.h>