From patchwork Tue Mar 4 18:22:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonios Motakis X-Patchwork-Id: 326435 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id BD8BE2C0096 for ; Wed, 5 Mar 2014 05:31:32 +1100 (EST) Received: from localhost ([::1]:47367 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKu7m-0008H7-Bx for incoming@patchwork.ozlabs.org; Tue, 04 Mar 2014 13:31:30 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53322) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKu5x-0005g1-0z for qemu-devel@nongnu.org; Tue, 04 Mar 2014 13:29:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WKu5g-0006CG-4F for qemu-devel@nongnu.org; Tue, 04 Mar 2014 13:29:36 -0500 Received: from mail-we0-f174.google.com ([74.125.82.174]:51007) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKu5f-0006C5-UC for qemu-devel@nongnu.org; Tue, 04 Mar 2014 13:29:20 -0500 Received: by mail-we0-f174.google.com with SMTP id t60so5313727wes.5 for ; Tue, 04 Mar 2014 10:29:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2wKljA8QEHRV2hQPPsUq0N7E8psdmW+Y5+Mjwpfje64=; b=PA+OnAZg8sZrRH6trcVRXfBikawChczmBuD7fZy2pOA0kDMpJLVlR7WWbOWaBf99I5 XSlgrm67oStMERLhQbPoLYOSMB3AGD+p4IvB0gR5X32RnJVY6EduEIt9YLfF/PVaTT4+ PslkBCT6XprPAtGSar72gKDFwHeaOr0iC1e5whH2HvZC3h8VlNcGKcniL/OH7gzElv6u LtfwKh6YYzfxHKUWBkWnhGLSxoR+LJEKgIjEvTVesgnvVNLHa15ka9eNSjPbtok93VxU 371++Wq35hBrw18XT2yMglMNw6+VDYa4Iyrp7WosX6k4PbqCQ1xacXio9E28TWjfEaaf bPyA== X-Gm-Message-State: ALoCoQm9ezB9+TpH+JVjhZXrwIUGzhQTF1q1zytfSxe8ZiFPOA0yNkDa7LonEYQodPSK2BS7zVj5 X-Received: by 10.194.57.140 with SMTP id i12mr1681447wjq.20.1393957414343; Tue, 04 Mar 2014 10:23:34 -0800 (PST) Received: from localhost.localdomain (home.tvelocity.eu. [82.67.68.96]) by mx.google.com with ESMTPSA id br10sm55666369wjb.3.2014.03.04.10.23.32 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Mar 2014 10:23:33 -0800 (PST) From: Antonios Motakis To: qemu-devel@nongnu.org, snabb-devel@googlegroups.com Date: Tue, 4 Mar 2014 19:22:49 +0100 Message-Id: <1393957383-16685-7-git-send-email-a.motakis@virtualopensystems.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1393957383-16685-1-git-send-email-a.motakis@virtualopensystems.com> References: <1393957383-16685-1-git-send-email-a.motakis@virtualopensystems.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 74.125.82.174 Cc: mst@redhat.com, n.nikolaev@virtualopensystems.com, Anthony Liguori , lukego@gmail.com, Antonios Motakis , tech@virtualopensystems.com Subject: [Qemu-devel] [PATCH v9 06/20] Add G_IO_HUP handler for socket chardev 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 This is used to detect that the remote end has disconnected. Just call tcp_char_disconnect on receiving this event. Signed-off-by: Antonios Motakis Signed-off-by: Nikolay Nikolaev --- qemu-char.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/qemu-char.c b/qemu-char.c index f9bd047..68a37d2 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2673,6 +2673,21 @@ CharDriverState *qemu_chr_open_eventfd(int eventfd) } #endif +static gboolean tcp_chr_chan_close(GIOChannel *channel, GIOCondition cond, + void *opaque) +{ + CharDriverState *chr = opaque; + + if (cond != G_IO_HUP) { + return FALSE; + } + + /* connection closed */ + tcp_chr_disconnect(chr); + + return TRUE; +} + static void tcp_chr_connect(void *opaque) { CharDriverState *chr = opaque; @@ -2682,6 +2697,7 @@ static void tcp_chr_connect(void *opaque) if (s->chan) { chr->fd_in_tag = io_add_watch_poll(s->chan, tcp_chr_read_poll, tcp_chr_read, chr); + g_io_add_watch(s->chan, G_IO_HUP, tcp_chr_chan_close, chr); } qemu_chr_be_generic_open(chr); }