From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:57134) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gk66G-0005S8-7j for qemu-devel@nongnu.org; Thu, 17 Jan 2019 06:44:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gk66E-0004TW-93 for qemu-devel@nongnu.org; Thu, 17 Jan 2019 06:44:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:20070) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gk66D-0004E4-SW for qemu-devel@nongnu.org; Thu, 17 Jan 2019 06:44:42 -0500 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Thu, 17 Jan 2019 15:43:35 +0400 Message-Id: <20190117114359.5164-4-marcandre.lureau@redhat.com> In-Reply-To: <20190117114359.5164-1-marcandre.lureau@redhat.com> References: <20190117114359.5164-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 03/27] net/slirp: free forwarding rules on cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Zhang Chen , Li Zhijian , pbonzini@redhat.com, Jan Kiszka , Samuel Thibault , Jason Wang Signed-off-by: Marc-Andr=C3=A9 Lureau --- net/slirp.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/net/slirp.c b/net/slirp.c index b91741b8fc1..750105a466e 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -75,6 +75,13 @@ struct slirp_config_str { char str[1024]; }; =20 +struct GuestFwd { + CharBackend hd; + struct in_addr server; + int port; + Slirp *slirp; +}; + typedef struct SlirpState { NetClientState nc; QTAILQ_ENTRY(SlirpState) entry; @@ -83,6 +90,7 @@ typedef struct SlirpState { #ifndef _WIN32 gchar *smb_dir; #endif + GSList *fwd; } SlirpState; =20 static struct slirp_config_str *slirp_configs; @@ -122,10 +130,19 @@ static void slirp_smb_exit(Notifier *n, void *data) slirp_smb_cleanup(s); } =20 +static void slirp_free_fwd(gpointer data) +{ + struct GuestFwd *fwd =3D data; + + qemu_chr_fe_deinit(&fwd->hd, true); + g_free(data); +} + static void net_slirp_cleanup(NetClientState *nc) { SlirpState *s =3D DO_UPCAST(SlirpState, nc, nc); =20 + g_slist_free_full(s->fwd, slirp_free_fwd); slirp_cleanup(s->slirp); if (s->exit_notifier.notify) { qemu_remove_exit_notifier(&s->exit_notifier); @@ -717,13 +734,6 @@ static int slirp_smb(SlirpState* s, const char *expo= rted_dir, =20 #endif /* !defined(_WIN32) */ =20 -struct GuestFwd { - CharBackend hd; - struct in_addr server; - int port; - Slirp *slirp; -}; - static int guestfwd_can_read(void *opaque) { struct GuestFwd *fwd =3D opaque; @@ -814,6 +824,7 @@ static int slirp_guestfwd(SlirpState *s, const char *= config_str, Error **errp) =20 qemu_chr_fe_set_handlers(&fwd->hd, guestfwd_can_read, guestfwd_r= ead, NULL, NULL, fwd, NULL, true); + s->fwd =3D g_slist_append(s->fwd, fwd); } return 0; =20 --=20 2.20.1.98.gecbdaf0899