From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48812) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UG8DE-00057l-2C for qemu-devel@nongnu.org; Thu, 14 Mar 2013 09:28:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UG8D9-00016B-8i for qemu-devel@nongnu.org; Thu, 14 Mar 2013 09:28:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:21333) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UG8D8-000165-Vt for qemu-devel@nongnu.org; Thu, 14 Mar 2013 09:28:47 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2EDSkkD021107 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 14 Mar 2013 09:28:46 -0400 Message-ID: <5141D153.8080409@redhat.com> Date: Thu, 14 Mar 2013 14:32:03 +0100 From: Hans de Goede MIME-Version: 1.0 References: <1363183187-16258-1-git-send-email-hdegoede@redhat.com> <1363183187-16258-3-git-send-email-hdegoede@redhat.com> <20130314073550.GA10264@amit.redhat.com> In-Reply-To: <20130314073550.GA10264@amit.redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 2/7] virtio-console: Remove any pending watches on close List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Amit Shah Cc: =?ISO-8859-1?Q?Marc-Andr=E9_Lureau?= , qemu-devel@nongnu.org, Gerd Hoffmann Hi, On 03/14/2013 08:35 AM, Amit Shah wrote: > On (Wed) 13 Mar 2013 [14:59:42], Hans de Goede wrote: >> Signed-off-by: Hans de Goede >> --- >> hw/virtio-console.c | 16 ++++++++++++++-- >> 1 file changed, 14 insertions(+), 2 deletions(-) >> >> diff --git a/hw/virtio-console.c b/hw/virtio-console.c >> index 1d87c5b..ec0f91b 100644 >> --- a/hw/virtio-console.c >> +++ b/hw/virtio-console.c >> @@ -18,6 +18,7 @@ >> typedef struct VirtConsole { >> VirtIOSerialPort port; >> CharDriverState *chr; >> + guint watch; >> } VirtConsole; >> >> /* >> @@ -29,6 +30,7 @@ static gboolean chr_write_unblocked(GIOChannel *chan, GIOCondition cond, >> { >> VirtConsole *vcon = opaque; >> >> + vcon->watch = 0; >> virtio_serial_throttle_port(&vcon->port, false); >> return FALSE; >> } >> @@ -60,8 +62,10 @@ static ssize_t flush_buf(VirtIOSerialPort *port, const uint8_t *buf, size_t len) >> ret = 0; >> if (!k->is_console) { >> virtio_serial_throttle_port(port, true); >> - qemu_chr_fe_add_watch(vcon->chr, G_IO_OUT, chr_write_unblocked, >> - vcon); >> + if (!vcon->watch) { >> + vcon->watch = qemu_chr_fe_add_watch(vcon->chr, G_IO_OUT, >> + chr_write_unblocked, vcon); >> + } >> } >> } >> return ret; >> @@ -86,6 +90,10 @@ static void guest_close(VirtIOSerialPort *port) >> if (!vcon->chr) { >> return; >> } >> + if (vcon->watch) { >> + g_source_remove(vcon->watch); >> + vcon->watch = 0; >> + } >> qemu_chr_fe_close(vcon->chr); >> } > > Even if a guest closed the connection, we want the data the guest sent > before the close to go out. > > What's the reason to not do that? There is no reason, this was a bad attempt by me to deal with closing the watch on virtio-port hot-unplug. I've removed this in my local version of the patchset and instead added an exit callback to deal with virtio-port hot-unplug the proper way. I still have a few other patches for spice-qemu-char.c I'm working on, once those are finished, I'll resend the series with this fixed and rebased on top of Gerd Hoffman's chardev.v5 tree. Regards, Hans