From nobody Sun Jul 13 04:50:09 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1486049909042833.7233548843822; Thu, 2 Feb 2017 07:38:29 -0800 (PST) Received: from localhost ([::1]:57323 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cZJSs-00066n-Vu for importer@patchew.org; Thu, 02 Feb 2017 10:38:27 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39675) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cZIkQ-0004we-WD for qemu-devel@nongnu.org; Thu, 02 Feb 2017 09:52:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cZIkN-0004HW-2W for qemu-devel@nongnu.org; Thu, 02 Feb 2017 09:52:31 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45688) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cZIkM-0004HA-Sa for qemu-devel@nongnu.org; Thu, 02 Feb 2017 09:52:26 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 003E0804EE for ; Thu, 2 Feb 2017 14:52:27 +0000 (UTC) Received: from localhost (ovpn-116-38.phx2.redhat.com [10.3.116.38]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v12EqNaL010623; Thu, 2 Feb 2017 09:52:25 -0500 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Thu, 2 Feb 2017 18:51:28 +0400 Message-Id: <20170202145141.17138-10-marcandre.lureau@redhat.com> In-Reply-To: <20170202145141.17138-1-marcandre.lureau@redhat.com> References: <20170202145141.17138-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 02 Feb 2017 14:52:27 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 09/22] char: remove chardevs list 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: pbonzini@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The list is now empty, the chardev cleanup is taken care of by the unref of the root container. Signed-off-by: Marc-Andr=C3=A9 Lureau --- include/sysemu/char.h | 8 -------- chardev/char.c | 15 --------------- vl.c | 1 - 3 files changed, 24 deletions(-) diff --git a/include/sysemu/char.h b/include/sysemu/char.h index e3f3a10d17..e273c94421 100644 --- a/include/sysemu/char.h +++ b/include/sysemu/char.h @@ -95,7 +95,6 @@ struct Chardev { int be_open; guint fd_in_tag; DECLARE_BITMAP(features, QEMU_CHAR_FEATURE_LAST); - QTAILQ_ENTRY(Chardev) next; }; =20 /** @@ -142,13 +141,6 @@ Chardev *qemu_chr_new(const char *label, const char *f= ilename); void qemu_chr_fe_disconnect(CharBackend *be); =20 /** - * @qemu_chr_cleanup: - * - * Delete all chardevs (when leaving qemu) - */ -void qemu_chr_cleanup(void); - -/** * @qemu_chr_fe_wait_connected: * * Wait for characted backend to be connected, return < 0 on error or diff --git a/chardev/char.c b/chardev/char.c index 1103b08177..f47d933828 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -42,9 +42,6 @@ /***********************************************************/ /* character device */ =20 -static QTAILQ_HEAD(ChardevHead, Chardev) chardevs =3D - QTAILQ_HEAD_INITIALIZER(chardevs); - static Object *get_chardevs_root(void) { return container_get(object_get_root(), "/chardevs"); @@ -1050,9 +1047,6 @@ void qemu_chr_fe_disconnect(CharBackend *be) =20 void qemu_chr_delete(Chardev *chr) { - if (QTAILQ_IN_USE(chr, next)) { - QTAILQ_REMOVE(&chardevs, chr, next); - } if (OBJECT(chr)->parent) { object_unparent(OBJECT(chr)); } else { @@ -1317,15 +1311,6 @@ void qmp_chardev_remove(const char *id, Error **errp) qemu_chr_delete(chr); } =20 -void qemu_chr_cleanup(void) -{ - Chardev *chr, *tmp; - - QTAILQ_FOREACH_SAFE(chr, &chardevs, next, tmp) { - qemu_chr_delete(chr); - } -} - static void register_types(void) { type_register_static(&char_type_info); diff --git a/vl.c b/vl.c index 945df1d17f..7bce3b07e2 100644 --- a/vl.c +++ b/vl.c @@ -4639,7 +4639,6 @@ int main(int argc, char **argv, char **envp) net_cleanup(); audio_cleanup(); monitor_cleanup(); - qemu_chr_cleanup(); object_unref(object_get_root()); =20 return 0; --=20 2.11.0.295.gd7dffce1c.dirty