[Spice-devel] [PATCH spice-protocol v2 1/4] Generated enums.h from spice.proto

[Yonit Halperin]

- renamed usbredir to spicevmc in spice.proto.
- Added the defintions bellow to protocol.h since they were previously
  manually added to enums.h.

define SPICE_CHANNEL_USBREDIR SPICE_CHANNEL_SPICEVMC
define SPICE_CHANNEL_USER_DEFINED_START 128
---
 spice/enums.h    |    6 ++----
 spice/protocol.h |    3 +++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/spice/enums.h b/spice/enums.h
index a587b00..01bd286 100644
--- a/spice/enums.h
+++ b/spice/enums.h
@@ -329,11 +329,9 @@ enum {
     SPICE_CHANNEL_RECORD,
     SPICE_CHANNEL_TUNNEL,
     SPICE_CHANNEL_SMARTCARD,
-    SPICE_CHANNEL_USBREDIR,
+    SPICE_CHANNEL_SPICEVMC,
 
-    SPICE_END_CHANNEL,
-
-    SPICE_CHANNEL_USER_DEFINED_START = 128
+    SPICE_END_CHANNEL
 };
 
 enum {
diff --git a/spice/protocol.h b/spice/protocol.h
index ddfe84b..db8be89 100644
--- a/spice/protocol.h
+++ b/spice/protocol.h
@@ -44,6 +44,9 @@
 #define SPICE_TICKET_KEY_PAIR_LENGTH 1024
 #define SPICE_TICKET_PUBKEY_BYTES (SPICE_TICKET_KEY_PAIR_LENGTH / 8 + 34)
 
+#define SPICE_CHANNEL_USBREDIR SPICE_CHANNEL_SPICEVMC
+#define SPICE_CHANNEL_USER_DEFINED_START 128
+
 typedef struct SPICE_ATTR_PACKED SpiceLinkHeader {
     uint32_t magic;
     uint32_t major_version;
-- 
1.7.6.4