From patchwork Thu Feb 13 12:03:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonios Motakis X-Patchwork-Id: 319986 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 EF0B82C00B0 for ; Thu, 13 Feb 2014 23:04:53 +1100 (EST) Received: from localhost ([::1]:45716 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDv2B-0007dx-PE for incoming@patchwork.ozlabs.org; Thu, 13 Feb 2014 07:04:51 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39640) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDv1Q-0007SU-Jf for qemu-devel@nongnu.org; Thu, 13 Feb 2014 07:04:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WDv1K-00013p-FX for qemu-devel@nongnu.org; Thu, 13 Feb 2014 07:04:04 -0500 Received: from mail-wi0-f174.google.com ([209.85.212.174]:38329) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDv1K-00013j-9Y for qemu-devel@nongnu.org; Thu, 13 Feb 2014 07:03:58 -0500 Received: by mail-wi0-f174.google.com with SMTP id f8so8468047wiw.7 for ; Thu, 13 Feb 2014 04:03:57 -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=sbWOxmnC1R+JxrPe9dxOHqDGBKrnK35QIdIq+GW2xns=; b=kXsYku70rUl5ddEO8ilk0grneCEkPR9Zm51G5kHbntmF/hK6kwAtIDcjdMU5A7Rfet DH7k6uu085G0tFZZVM8q0/pYca9DxmIdMuohoNs+nZG8rMKsdV+8+Op4xSuBh7OvpcsM G62617NT8MRhCi4wFfcuKQAxIH+TffG3L+wJv0guj0ixgFV094RFnQC06gSsXy2JfH08 Kdubs5EGuW+5Rvy7nDuD35nJSM3WRmE3Ps5rFv6wDUVpI9qctt0r1rccos3uaabTWxRw Ls2gS/A0PwRPSGji0xUPRJTWw2K74F8v29FYDrw5qB7B1dwbgjvlf6Z2bbQnHl6f/jZp F2Tg== X-Gm-Message-State: ALoCoQk1hLF7oHscuLGQdgEMOG7b4qtFK64Xk6hNkIK3/67pkjIvB/qZB/lEaS6rIpvDSDWhbI27 X-Received: by 10.180.87.9 with SMTP id t9mr5933612wiz.36.1392293037475; Thu, 13 Feb 2014 04:03:57 -0800 (PST) Received: from localhost.localdomain (home.tvelocity.eu. [82.67.68.96]) by mx.google.com with ESMTPSA id bj3sm4039419wjb.14.2014.02.13.04.03.55 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 13 Feb 2014 04:03:56 -0800 (PST) From: Antonios Motakis To: qemu-devel@nongnu.org, snabb-devel@googlegroups.com Date: Thu, 13 Feb 2014 13:03:16 +0100 Message-Id: <1392293009-13812-6-git-send-email-a.motakis@virtualopensystems.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1392293009-13812-1-git-send-email-a.motakis@virtualopensystems.com> References: <1392293009-13812-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: 209.85.212.174 Cc: mst@redhat.com, n.nikolaev@virtualopensystems.com, Anthony Liguori , lukego@gmail.com, Antonios Motakis , tech@virtualopensystems.com Subject: [Qemu-devel] [PATCH v8 05/17] 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 f168ac5..d82e2db 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); }