[Spice-commits] 4 commits - common/client_marshallers.h Makefile.am spice.proto spice-protocol

[Alon Levy]

 Makefile.am                 |    4 +++-
 common/client_marshallers.h |    2 +-
 spice-protocol              |    2 +-
 spice.proto                 |    6 +++---
 4 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit d40a181a20f14ae27c9ea7eb897b435bfc53e5db
Author: Alon Levy <alevy at redhat.com>
Date:   Thu Jun 14 14:30:53 2012 +0300

    Makefile.am: now that spice_codegen.py is used add *.pyc to ignored files in root

diff --git a/Makefile.am b/Makefile.am
index 3b3c88d..79f7903 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,6 +10,8 @@ EXTRA_DIST =				\
 	spice1.proto			\
 	$(NULL)
 
+DISTCLEANFILES = *.pyc
+
 MAINTAINERCLEANFILES =						\
 	$(srcdir)/INSTALL					\
 	$(srcdir)/aclocal.m4					\
commit 9dff18a399fe07f5c53b0ba65715f0d58a60c6a0
Author: Alon Levy <alevy at redhat.com>
Date:   Thu Jun 14 14:14:31 2012 +0300

    Makefile.am: fix .gitignore not being generated in spice-protocol/spice
    
    By adding spice-protocol to SUBDIRS configure and make will be called in it.
    
    Spotted by Marc-André.

diff --git a/Makefile.am b/Makefile.am
index 28450b4..3b3c88d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 NULL =
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = python_modules common
+SUBDIRS = python_modules common spice-protocol
 DIST_SUBDIRS = spice-protocol $(SUBDIRS)
 
 EXTRA_DIST =				\
commit d5d26cac49e0a0b6069f10eeeea3a49e4f4ed321
Author: Alon Levy <alevy at redhat.com>
Date:   Thu Jun 14 13:04:11 2012 +0300

    updated spice-protocol for smartcard enums non conflict with libcacard

diff --git a/spice-protocol b/spice-protocol
index bf0daeb..6bae9fd 160000
--- a/spice-protocol
+++ b/spice-protocol
@@ -1 +1 @@
-Subproject commit bf0daeb3a3c834133e781439f76b1c702470581b
+Subproject commit 6bae9fde0316b74433252bf324a114263d2dccc9
commit 535b52db66a6936840ed7323fe809fad780485ba
Author: Alon Levy <alevy at redhat.com>
Date:   Thu Jun 14 12:40:47 2012 +0300

    smartcard: build fixes for spice server
    
    Define different enums that have a SPICE_ prefix to not conflict with same
    value enums from libcacard/vsccard_common.h, and continue to use the same
    SPICE_MSG_SMARTCARD_DATA and SPICE_MSGC_SMARTCARD_DATA enum that is used by the
    server and clients (spice-gtk, spicec) alike.

diff --git a/common/client_marshallers.h b/common/client_marshallers.h
index f7322d1..1bd95ae 100644
--- a/common/client_marshallers.h
+++ b/common/client_marshallers.h
@@ -66,7 +66,7 @@ typedef struct {
     void (*msgc_smartcard_atr)(SpiceMarshaller *m, VSCMsgATR *msg);
     void (*msgc_smartcard_error)(SpiceMarshaller *m, VSCMsgError *msg);
     void (*msgc_smartcard_header)(SpiceMarshaller *m, VSCMsgHeader *msg);
-    void (*msgc_smartcard_msg)(SpiceMarshaller *m, SpiceMsgcSmartcard *msg, SpiceMarshaller **reader_name_out);
+    void (*msgc_smartcard_data)(SpiceMarshaller *m, SpiceMsgcSmartcard *msg, SpiceMarshaller **reader_name_out);
     void (*msgc_smartcard_reader_add)(SpiceMarshaller *m, VSCMsgReaderAdd *msg);
 #endif
 } SpiceMessageMarshallers;
diff --git a/spice.proto b/spice.proto
index 71be9ac..a86bfa7 100644
--- a/spice.proto
+++ b/spice.proto
@@ -1139,7 +1139,7 @@ enum32 vsc_message_type {
     APDU,
     Flush,
     FlushComplete
-} @prefix(VSC_);
+};
 
 struct VscMessageHeader {
     vsc_message_type type;
@@ -1170,7 +1170,7 @@ channel SmartcardChannel : BaseChannel {
 	uint32 reader_id;
 	uint32 length;
 	uint8 data[] @end;
-    } @ctype(SpiceMsgSmartcard) msg = 101;
+    } @ctype(SpiceMsgSmartcard) data = 101;
 
  client:
     message {
@@ -1184,7 +1184,7 @@ channel SmartcardChannel : BaseChannel {
 	case Error:
 	    VscMessageError error;
 	} u @anon;
-    } @ctype(SpiceMsgcSmartcard) msg = 101;
+    } @ctype(SpiceMsgcSmartcard) data = 101;
 
     message {
 	vsc_message_type type;