From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:57614) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QkEnf-0008D3-Ky for qemu-devel@nongnu.org; Fri, 22 Jul 2011 08:25:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QkEnd-0003hB-6l for qemu-devel@nongnu.org; Fri, 22 Jul 2011 08:25:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32874) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QkEnc-0003h1-TP for qemu-devel@nongnu.org; Fri, 22 Jul 2011 08:25:49 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p6MCPlNW019859 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 22 Jul 2011 08:25:47 -0400 Date: Fri, 22 Jul 2011 15:25:19 +0300 From: Alon Levy Message-ID: <20110722122519.GF2483@bow.tlv.redhat.com> References: <1311327655-5728-1-git-send-email-hdegoede@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1311327655-5728-1-git-send-email-hdegoede@redhat.com> Subject: Re: [Qemu-devel] [PATCH] spice-qemu-char: Generate chardev open/close events (v3) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Hans de Goede Cc: Gerd Hoffmann , qemu-devel@nongnu.org On Fri, Jul 22, 2011 at 11:40:55AM +0200, Hans de Goede wrote: > Define a state callback and make that generate chardev open/close events when > called by the spice-server. Note the code ignores these events for a spicevmc > with a subtypem of vdagent, this subtype specific knowledge is undesirable, > but unavoidable, see: > http://lists.freedesktop.org/archives/spice-devel/2011-July/004837.html > > Changes in v2: > -Only ignore the state callback for spicevmc chardevs with a subtype of > vdagent, instead of only allowing them for a subtype of usbredir > > Changes in v3: > -This version actually compiles, sorry about that! > ACK. Another option would be to not call the state callback for the vdagent subtype from spice-server, because like you say it ignores the continued communication between the agent and the server. Then you could remove the subtype check. > Signed-off-by: Hans de Goede > --- > spice-qemu-char.c | 42 +++++++++++++++++++++++++++++++++++++++++- > 1 files changed, 41 insertions(+), 1 deletions(-) > > diff --git a/spice-qemu-char.c b/spice-qemu-char.c > index ce75e91..a472f7e 100644 > --- a/spice-qemu-char.c > +++ b/spice-qemu-char.c > @@ -89,11 +89,48 @@ static int vmc_read(SpiceCharDeviceInstance *sin, uint8_t *buf, int len) > return bytes; > } > > +static void vmc_state(SpiceCharDeviceInstance *sin, int connected) > +{ > + SpiceCharDriver *scd = container_of(sin, SpiceCharDriver, sin); > + int event; > + > + /* > + * 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; > + } > + > + if ((scd->chr->opened && connected) || > + (!scd->chr->opened && !connected)) { > + return; > + } > + > + if (connected) { > + scd->chr->opened = 1; > + event = CHR_EVENT_OPENED; > + } else { > + scd->chr->opened = 0; > + event = CHR_EVENT_CLOSED; > + } > + > + if (scd->chr->chr_event) { > + scd->chr->chr_event(scd->chr->handler_opaque, event); > + } > +} > + > static SpiceCharDeviceInterface vmc_interface = { > .base.type = SPICE_INTERFACE_CHAR_DEVICE, > .base.description = "spice virtual channel char device", > .base.major_version = SPICE_INTERFACE_CHAR_DEVICE_MAJOR, > .base.minor_version = SPICE_INTERFACE_CHAR_DEVICE_MINOR, > + .state = vmc_state, > .write = vmc_write, > .read = vmc_read, > }; > @@ -222,7 +259,10 @@ CharDriverState *qemu_chr_open_spice(QemuOpts *opts) > chr->chr_guest_close = spice_chr_guest_close; > s->unblock_timer = qemu_new_timer_ms(vm_clock, spice_chr_unblock, s); > > - qemu_chr_generic_open(chr); > + /* See comment in vmc_state() */ > + if (strcmp(subtype, "vdagent") == 0) { > + qemu_chr_generic_open(chr); > + } > > return chr; > } > -- > 1.7.5.1 > >