[Spice-devel] [PATCH spice-server v2 2/8] server: s/SPICE_CHANNEL_USBREDIR/SPICE_CHANNEL_SPICEVMC

Yonit Halperin yhalperi at redhat.com
Tue Jan 10 03:25:16 PST 2012


The newly generated enums.h names the spicevmc channel
SPICE_CHANNEL_SPICEVMC.
---
 server/reds.c     |    2 +-
 server/spicevmc.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/reds.c b/server/reds.c
index acd8495..eadb068 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -3299,7 +3299,7 @@ static int spice_server_char_device_add_interface(SpiceServer *s,
     }
 #endif
     else if (strcmp(char_device->subtype, SUBTYPE_USBREDIR) == 0) {
-        spicevmc_device_connect(char_device, SPICE_CHANNEL_USBREDIR);
+        spicevmc_device_connect(char_device, SPICE_CHANNEL_SPICEVMC);
     }
     return 0;
 }
diff --git a/server/spicevmc.c b/server/spicevmc.c
index bed8488..a08f330 100644
--- a/server/spicevmc.c
+++ b/server/spicevmc.c
@@ -89,7 +89,7 @@ static int spicevmc_red_channel_client_config_socket(RedChannelClient *rcc)
     int delay_val = 1;
     RedsStream *stream = red_channel_client_get_stream(rcc);
 
-    if (rcc->channel->type == SPICE_CHANNEL_USBREDIR) {
+    if (rcc->channel->type == SPICE_CHANNEL_SPICEVMC) {
         if (setsockopt(stream->socket, IPPROTO_TCP, TCP_NODELAY,
                 &delay_val, sizeof(delay_val)) != 0) {
             red_printf("setsockopt failed, %s", strerror(errno));
-- 
1.7.6.4



More information about the Spice-devel mailing list