From patchwork Thu Feb 7 14:03:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 10801359 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2BD7F14E1 for ; Thu, 7 Feb 2019 14:27:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1B2072D9D5 for ; Thu, 7 Feb 2019 14:27:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0FA502D9DA; Thu, 7 Feb 2019 14:27:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B9E002D9D5 for ; Thu, 7 Feb 2019 14:27:47 +0000 (UTC) Received: from localhost ([127.0.0.1]:40929 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grkeY-0005Ch-U8 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 07 Feb 2019 09:27:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57723) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grkHs-0002Ri-A0 for qemu-devel@nongnu.org; Thu, 07 Feb 2019 09:04:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grkHe-0001AW-KU for qemu-devel@nongnu.org; Thu, 07 Feb 2019 09:04:16 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:41904) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1grkHc-0000yy-Ga for qemu-devel@nongnu.org; Thu, 07 Feb 2019 09:04:05 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id C1984CC15; Thu, 7 Feb 2019 15:03:38 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1S4jrC_k3737; Thu, 7 Feb 2019 15:03:37 +0100 (CET) Received: from function (unknown [160.40.205.85]) by hera.aquilenet.fr (Postfix) with ESMTPSA id BA696CD3B; Thu, 7 Feb 2019 15:03:20 +0100 (CET) Received: from samy by function with local (Exim 4.92-RC4) (envelope-from ) id 1grkGs-0004E9-6U; Thu, 07 Feb 2019 15:03:18 +0100 From: Samuel Thibault To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Thu, 7 Feb 2019 16:03:13 +0200 Message-Id: <20190207140316.16103-30-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190207140316.16103-1-samuel.thibault@ens-lyon.org> References: <20190207140316.16103-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 185.233.100.1 Subject: [Qemu-devel] [PULLv4 29/32] slirp: remove slirp_instances 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: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Samuel Thibault , stefanha@redhat.com, jan.kiszka@siemens.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Marc-André Lureau Now that polling is done per-instance, we don't need a global list of slirp instances. Signed-off-by: Marc-André Lureau Signed-off-by: Samuel Thibault --- slirp/slirp.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/slirp/slirp.c b/slirp/slirp.c index 3a8d1bc459..b37dd34382 100644 --- a/slirp/slirp.c +++ b/slirp/slirp.c @@ -48,9 +48,6 @@ static const uint8_t special_ethaddr[ETH_ALEN] = { unsigned curtime; -static QTAILQ_HEAD(, Slirp) slirp_instances = - QTAILQ_HEAD_INITIALIZER(slirp_instances); - static struct in_addr dns_addr; #ifndef _WIN32 static struct in6_addr dns6_addr; @@ -333,7 +330,6 @@ Slirp *slirp_init(int restricted, bool in_enabled, struct in_addr vnetwork, #ifdef WITH_QEMU slirp_state_register(slirp); #endif - QTAILQ_INSERT_TAIL(&slirp_instances, slirp, entry); return slirp; } @@ -348,7 +344,6 @@ void slirp_cleanup(Slirp *slirp) g_free(e); } - QTAILQ_REMOVE(&slirp_instances, slirp, entry); #ifdef WITH_QEMU slirp_state_unregister(slirp); #endif