From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53645) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMtum-00039o-E8 for qemu-devel@nongnu.org; Tue, 12 Jul 2016 05:23:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bMtuj-00075E-8i for qemu-devel@nongnu.org; Tue, 12 Jul 2016 05:23:40 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:35691) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMtuj-00074t-2n for qemu-devel@nongnu.org; Tue, 12 Jul 2016 05:23:37 -0400 Received: by mail-wm0-x241.google.com with SMTP id i5so1481058wmg.2 for ; Tue, 12 Jul 2016 02:23:36 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 12 Jul 2016 11:23:33 +0200 Message-Id: <1468315413-22846-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH] slirp: use exit notifier for slirp_smb_cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: jasowang@redhat.com, marcandre.lureau@redhat.com We would like to move back net_cleanup() at the end of main function, like it used to be until f30dbae63a46f23116715dff8d130c, but minimum cleanup is needed regardless at exit() time for slirp's SMB functionality. Use an exit notifier to call slirp_smb_cleanup. If net_cleanup() is called first, then remove the exit notifier as it will become a dangling pointer otherwise. Signed-off-by: Paolo Bonzini --- net/slirp.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/net/slirp.c b/net/slirp.c index 31630f0..28207b6 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -38,6 +38,7 @@ #include "slirp/libslirp.h" #include "slirp/ip6.h" #include "sysemu/char.h" +#include "sysemu/sysemu.h" #include "qemu/cutils.h" static int get_str_sep(char *buf, int buf_size, const char **pp, int sep) @@ -76,6 +77,7 @@ typedef struct SlirpState { NetClientState nc; QTAILQ_ENTRY(SlirpState) entry; Slirp *slirp; + Notifier exit_notifier; #ifndef _WIN32 char smb_dir[128]; #endif @@ -118,11 +120,18 @@ static ssize_t net_slirp_receive(NetClientState *nc, const uint8_t *buf, size_t return size; } +static void slirp_smb_exit(Notifier *n, void *data) +{ + SlirpState *s = container_of(n, SlirpState, exit_notifier); + slirp_smb_cleanup(s); +} + static void net_slirp_cleanup(NetClientState *nc) { SlirpState *s = DO_UPCAST(SlirpState, nc, nc); slirp_cleanup(s->slirp); + qemu_remove_exit_notifier(&s->exit_notifier); slirp_smb_cleanup(s); QTAILQ_REMOVE(&slirp_stacks, s, entry); } @@ -349,6 +358,8 @@ static int net_slirp_init(NetClientState *peer, const char *model, } #endif + s->exit_notifier.notify = slirp_smb_exit; + qemu_add_exit_notifier(&s->exit_notifier); return 0; error: -- 2.7.4