mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spice-qemu-char: Remove #ifdef-ed code for old spice-server compat

Browse Source 
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>
This commit is contained in:
Hans de Goede 2013-04-05 11:30:21 +02:00 committed by Gerd Hoffmann
parent c3d6b96ebb
commit 52fe0e75b7
1 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
spice-qemu-char.c
View File

@ -85,21 +85,6 @@ static void vmc_state(SpiceCharDeviceInstance *sin, int connected)
{ {
SpiceCharDriver *scd = container_of(sin, SpiceCharDriver, sin); 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) || if ((scd->chr->be_open && connected) ||
(!scd->chr->be_open && !connected)) { (!scd->chr->be_open && !connected)) {
return; return;
@ -224,7 +209,6 @@ static CharDriverState *chr_open(const char *subtype)
CharDriverState *qemu_chr_open_spice_vmc(const char *type) CharDriverState *qemu_chr_open_spice_vmc(const char *type)
{ {
CharDriverState *chr;
const char **psubtype = spice_server_char_device_recognized_subtypes(); const char **psubtype = spice_server_char_device_recognized_subtypes();
if (type == NULL) { if (type == NULL) {
@ -243,16 +227,7 @@ CharDriverState *qemu_chr_open_spice_vmc(const char *type)
return NULL; return NULL;
} }
chr = chr_open(type); return 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;
} }
#if SPICE_SERVER_VERSION >= 0x000c02 #if SPICE_SERVER_VERSION >= 0x000c02