From patchwork Tue May 10 16:03:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 620723 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 3r43zh4x78z9t47 for ; Wed, 11 May 2016 02:07:12 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=FaQsj6sy; dkim-atps=neutral Received: from localhost ([::1]:47323 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b0ABi-0003JC-KB for incoming@patchwork.ozlabs.org; Tue, 10 May 2016 12:07:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59418) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b0A90-0006VK-5a for qemu-devel@nongnu.org; Tue, 10 May 2016 12:04:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b0A8s-00079T-Uv for qemu-devel@nongnu.org; Tue, 10 May 2016 12:04:20 -0400 Received: from mail-qg0-x22a.google.com ([2607:f8b0:400d:c04::22a]:35534) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b0A8s-00079N-QT for qemu-devel@nongnu.org; Tue, 10 May 2016 12:04:14 -0400 Received: by mail-qg0-x22a.google.com with SMTP id f74so8969318qge.2 for ; Tue, 10 May 2016 09:04:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Bq/ZfbwHfkoVz1Lr5FswYYqezdTJPLmbS0LxvmiOiNQ=; b=FaQsj6sybZjksgTEYDfQGq6Hstu8PcQJkVuT8CcalCYB0RC876nReXflzbQBLUuvSS a4ql0J1qy215CpcnRU3t6iYpDkRj81Htrr+75/Mgif+IlplG8KwzxkixNUdgu5IX+CKp /DMm0m49JHF/bglHylzwPZVA3dvbkhnTmnH29QAOorcd7ZPS+d0hzFJV6KdJUeEJfSxt Jng65YIY5WefXszMKwcgInYYm14IMW0VLZ6SF1NJXq41wtaYOI6ww+302D4zENF8l3K/ S119HByN2cVFB0rfmlwZZKNr2vv2HwwYxZ7xtZM5+i5to2SVRriA2EAjzF6nKF3gIrlX EDvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Bq/ZfbwHfkoVz1Lr5FswYYqezdTJPLmbS0LxvmiOiNQ=; b=Kykj2TWJXEmxz3d5YA/vesiNi8YenJo0F+c84vwtaQCIsL6iRvKjzrIPu7k98IiSnt 5hMCq2qoPFDc5335c3On1l6GrAEDVV5xiQiRA/CPcYssi1HC9X5jNoUo63ObWLh9tHt2 T0M/EZvkR2UzujbdIwSdgpd/mJ1fGz77JqRPCi4FLKwQtRJm5HFvoyFHWQbCP3N5K9T0 1eg6XqrFQrgMYwfkX9jDpeCEAZLSY0KUFM2HWjXbb2l72thpvpEDDoWdNMTucXeiPfG3 B///Z9OiMh3BdU1sZ8pC0UG3+838VbpQAtGM2vDskvopCN3/gh3UmW0FJ4tgQjUsJap9 xgtw== X-Gm-Message-State: AOPr4FUXR6PMHpAH5xLroPS81aLLG4Wo7EBth/A7KIxU/wVzVK1HRMrC8Pqx6YG9/swMaA== X-Received: by 10.140.102.117 with SMTP id v108mr42073943qge.103.1462896254350; Tue, 10 May 2016 09:04:14 -0700 (PDT) Received: from localhost (bne75-h02-31-39-163-232.dsl.sta.abo.bbox.fr. [31.39.163.232]) by smtp.gmail.com with ESMTPSA id l21sm1211961qgd.10.2016.05.10.09.04.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 May 2016 09:04:13 -0700 (PDT) From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Date: Tue, 10 May 2016 18:03:54 +0200 Message-Id: <1462896240-30999-5-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1462896240-30999-1-git-send-email-marcandre.lureau@redhat.com> References: <1462896240-30999-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400d:c04::22a Subject: [Qemu-devel] [PATCH 04/10] qemu-char: add qemu_chr_disconnect to close a fd accepted by listen fd X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tetsuya Mukawa , Ilya Maximets , Yuanhan Liu , jonshin@cisco.com, "Michael S . Tsirkin" Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Tetsuya Mukawa The patch introduces qemu_chr_disconnect(). The function is used for closing a fd accepted by listen fd. Though we already have qemu_chr_delete(), but it closes not only accepted fd but also listen fd. This new function is used when we still want to keep listen fd. Signed-off-by: Tetsuya Mukawa Reviewed-by: Marc-André Lureau --- include/sysemu/char.h | 7 +++++++ qemu-char.c | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/include/sysemu/char.h b/include/sysemu/char.h index 307fd8f..2c39987 100644 --- a/include/sysemu/char.h +++ b/include/sysemu/char.h @@ -75,6 +75,7 @@ struct CharDriverState { IOReadHandler *chr_read; void *handler_opaque; void (*chr_close)(struct CharDriverState *chr); + void (*chr_disconnect)(struct CharDriverState *chr); void (*chr_accept_input)(struct CharDriverState *chr); void (*chr_set_echo)(struct CharDriverState *chr, bool echo); void (*chr_set_fe_open)(struct CharDriverState *chr, int fe_open); @@ -143,6 +144,12 @@ void qemu_chr_parse_common(QemuOpts *opts, ChardevCommon *backend); */ CharDriverState *qemu_chr_new(const char *label, const char *filename, void (*init)(struct CharDriverState *s)); +/** + * @qemu_chr_disconnect: + * + * Close a fd accpeted by character backend. + */ +void qemu_chr_disconnect(CharDriverState *chr); /** * @qemu_chr_new_noreplay: diff --git a/qemu-char.c b/qemu-char.c index b597ee1..6efbc0d 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -4012,6 +4012,13 @@ void qemu_chr_fe_release(CharDriverState *s) s->avail_connections++; } +void qemu_chr_disconnect(CharDriverState *chr) +{ + if (chr->chr_disconnect) { + chr->chr_disconnect(chr); + } +} + static void qemu_chr_free_common(CharDriverState *chr) { g_free(chr->filename); @@ -4405,6 +4412,7 @@ static CharDriverState *qmp_chardev_open_socket(const char *id, chr->chr_write = tcp_chr_write; chr->chr_sync_read = tcp_chr_sync_read; chr->chr_close = tcp_chr_close; + chr->chr_disconnect = tcp_chr_disconnect; chr->get_msgfds = tcp_get_msgfds; chr->set_msgfds = tcp_set_msgfds; chr->chr_add_client = tcp_chr_add_client;