From patchwork Tue Apr 16 09:56:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 236898 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DE7CA2C0106 for ; Tue, 16 Apr 2013 19:58:33 +1000 (EST) Received: from localhost ([::1]:57599 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1US2em-0005d8-5l for incoming@patchwork.ozlabs.org; Tue, 16 Apr 2013 05:58:32 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53327) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1US2cy-0003Be-4q for qemu-devel@nongnu.org; Tue, 16 Apr 2013 05:56:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1US2cv-0005wI-Ps for qemu-devel@nongnu.org; Tue, 16 Apr 2013 05:56:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62230) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1US2cv-0005w0-H4 for qemu-devel@nongnu.org; Tue, 16 Apr 2013 05:56:37 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r3G9uaFV014460 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 16 Apr 2013 05:56:37 -0400 Received: from rincewind.home.kraxel.org (ovpn-116-37.ams2.redhat.com [10.36.116.37]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r3G9uZaT028374; Tue, 16 Apr 2013 05:56:36 -0400 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id 9582640E9D; Tue, 16 Apr 2013 11:56:34 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 16 Apr 2013 11:56:31 +0200 Message-Id: <1366106194-28826-7-git-send-email-kraxel@redhat.com> In-Reply-To: <1366106194-28826-1-git-send-email-kraxel@redhat.com> References: <1366106194-28826-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Hans de Goede , Gerd Hoffmann Subject: [Qemu-devel] [PATCH 6/9] spice-qemu-char: Remove #ifdef-ed code for old spice-server compat X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Hans de Goede We now require spice-server to be >= 0.12.0 so this is no longer needed. Signed-off-by: Hans de Goede Signed-off-by: Gerd Hoffmann --- spice-qemu-char.c | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/spice-qemu-char.c b/spice-qemu-char.c index c9403de..be19917 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