From patchwork Wed Aug 28 05:10:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Shah X-Patchwork-Id: 270334 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8FEAC2C009E for ; Wed, 28 Aug 2013 15:14:44 +1000 (EST) Received: from localhost ([::1]:60403 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VEY5a-0002dK-Ll for incoming@patchwork.ozlabs.org; Wed, 28 Aug 2013 01:14:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56614) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VEY2M-0006CV-QQ for qemu-devel@nongnu.org; Wed, 28 Aug 2013 01:11:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VEY2H-00053H-PU for qemu-devel@nongnu.org; Wed, 28 Aug 2013 01:11:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:10414) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VEY2H-000537-Il; Wed, 28 Aug 2013 01:11:17 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r7S5BG4Q007189 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 28 Aug 2013 01:11:16 -0400 Received: from localhost (dhcp193-119.pnq.redhat.com [10.65.193.119]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r7S5BErT001544; Wed, 28 Aug 2013 01:11:15 -0400 From: Amit Shah To: qemu list Date: Wed, 28 Aug 2013 10:40:46 +0530 Message-Id: <9807d5cb755dfc5e231cac33b4e4518dd3cdae06.1377666450.git.amit.shah@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: qemu-stable@nongnu.org, Hans de Goede , Gerd Hoffmann , Anthony Liguori , Amit Shah , Paolo Bonzini Subject: [Qemu-devel] [PATCH 4/9] char: introduce pty_chr_detach() 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 Remove any registered callbacks if a frontend is detached. CC: Signed-off-by: Amit Shah --- qemu-char.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/qemu-char.c b/qemu-char.c index 91ae1da..befecf2 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -1036,6 +1036,16 @@ typedef struct { static void pty_chr_update_read_handler(CharDriverState *chr); static void pty_chr_state(CharDriverState *chr, int connected); +static void pty_chr_detach(struct CharDriverState *chr) +{ + PtyCharDriver *s = chr->opaque; + + if (s->fd_tag) { + io_remove_watch_poll(s->fd_tag); + s->fd_tag = 0; + } +} + static gboolean pty_chr_timer(gpointer opaque) { struct CharDriverState *chr = opaque; @@ -1215,6 +1225,7 @@ static CharDriverState *qemu_chr_open_pty(const char *id, chr->chr_update_read_handler = pty_chr_update_read_handler; chr->chr_close = pty_chr_close; chr->chr_add_watch = pty_chr_add_watch; + chr->chr_detach = pty_chr_detach; chr->explicit_be_open = true; s->fd = io_channel_from_fd(master_fd);