diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2013-04-05 11:30:21 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2013-04-16 11:52:09 +0200 |
| commit | 52fe0e75b757c7c54fd3b967c9ff70d337790195 (patch) | |
| tree | 4248eb17df094f092eab25576a6c6bdc8746efc1 | |
| parent | c3d6b96ebba18d016be26ffa475feea0d81801a2 (diff) | |
spice-qemu-char: Remove #ifdef-ed code for old spice-server compat
We now require spice-server to be >= 0.12.0 so this is no longer needed.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| -rw-r--r-- | spice-qemu-char.c | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/spice-qemu-char.c b/spice-qemu-char.c index c9403de8af..be19917209 100644 --- a/spice-qemu-char.c +++ b/spice-qemu-char.c @@ -85,21 +85,6 @@ static void vmc_state(SpiceCharDeviceInstance *sin, int connected) { SpiceCharDriver *scd = container_of(sin, SpiceCharDriver, sin); -#if SPICE_SERVER_VERSION < 0x000901 - /* - * spice-server calls the state callback for the agent channel when the - * spice client connects / disconnects. Given that not the client but - * the server is doing the parsing of the messages this is wrong as the - * server is still listening. Worse, this causes the parser in the server - * to go out of sync, so we ignore state calls for subtype vdagent - * spicevmc chardevs. For the full story see: - * http://lists.freedesktop.org/archives/spice-devel/2011-July/004837.html - */ - if (strcmp(sin->subtype, "vdagent") == 0) { - return; - } -#endif - if ((scd->chr->be_open && connected) || (!scd->chr->be_open && !connected)) { return; @@ -224,7 +209,6 @@ static CharDriverState *chr_open(const char *subtype) CharDriverState *qemu_chr_open_spice_vmc(const char *type) { - CharDriverState *chr; const char **psubtype = spice_server_char_device_recognized_subtypes(); if (type == NULL) { @@ -243,16 +227,7 @@ CharDriverState *qemu_chr_open_spice_vmc(const char *type) return NULL; } - chr = chr_open(type); - -#if SPICE_SERVER_VERSION < 0x000901 - /* See comment in vmc_state() */ - if (strcmp(type, "vdagent") == 0) { - qemu_chr_generic_open(chr); - } -#endif - - return chr; + return chr_open(type); } #if SPICE_SERVER_VERSION >= 0x000c02 |