From patchwork Fri Apr 5 09:30:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 234079 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 C33B12C00B4 for ; Fri, 5 Apr 2013 20:29:08 +1100 (EST) Received: from localhost ([::1]:50954 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UO2xG-0003PS-WA for incoming@patchwork.ozlabs.org; Fri, 05 Apr 2013 05:29:07 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59162) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UO2vF-0000pN-Gb for qemu-devel@nongnu.org; Fri, 05 Apr 2013 05:27:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UO2vA-00054W-NR for qemu-devel@nongnu.org; Fri, 05 Apr 2013 05:27:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46487) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UO2vA-00054L-EB for qemu-devel@nongnu.org; Fri, 05 Apr 2013 05:26:56 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r359Qtin007071 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 5 Apr 2013 05:26:55 -0400 Received: from shalem.localdomain.com (vpn1-5-204.ams2.redhat.com [10.36.5.204]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r359QpNI032141; Fri, 5 Apr 2013 05:26:54 -0400 From: Hans de Goede To: Gerd Hoffmann Date: Fri, 5 Apr 2013 11:30:20 +0200 Message-Id: <1365154225-9443-3-git-send-email-hdegoede@redhat.com> In-Reply-To: <1365154225-9443-1-git-send-email-hdegoede@redhat.com> References: <1365154225-9443-1-git-send-email-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Hans de Goede , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 2/7] virtio-console: Remove any pending watches on close 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 Signed-off-by: Hans de Goede --- hw/virtio-console.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/hw/virtio-console.c b/hw/virtio-console.c index 61f9ff5..908ec17 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; } @@ -61,8 +63,10 @@ static ssize_t flush_buf(VirtIOSerialPort *port, 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; @@ -106,6 +110,10 @@ static void chr_event(void *opaque, int event) virtio_serial_open(&vcon->port); break; case CHR_EVENT_CLOSED: + if (vcon->watch) { + g_source_remove(vcon->watch); + vcon->watch = 0; + } virtio_serial_close(&vcon->port); break; } @@ -130,6 +138,17 @@ static int virtconsole_initfn(VirtIOSerialPort *port) return 0; } +static int virtconsole_exitfn(VirtIOSerialPort *port) +{ + VirtConsole *vcon = DO_UPCAST(VirtConsole, port, port); + + if (vcon->watch) { + g_source_remove(vcon->watch); + } + + return 0; +} + static Property virtconsole_properties[] = { DEFINE_PROP_CHR("chardev", VirtConsole, chr), DEFINE_PROP_END_OF_LIST(), @@ -142,6 +161,7 @@ static void virtconsole_class_init(ObjectClass *klass, void *data) k->is_console = true; k->init = virtconsole_initfn; + k->exit = virtconsole_exitfn; k->have_data = flush_buf; k->set_guest_connected = set_guest_connected; dc->props = virtconsole_properties;