From: Paolo Bonzini <pbonzini@redhat.com>
Date: Fri, 8 Jul 2016 15:28:34 +0000 (+0200)
Subject: net: do not use atexit for cleanup
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8caf911d3316b6eccc503cff0d9a68cf922950f1;p=qemu.git

net: do not use atexit for cleanup

This will be necessary in the next patch, which stops using atexit for
character devices; without it, vhost-user and the redirector filter
will cause a use-after-free.  Relying on the ordering of atexit calls
is also brittle, even now that both the network and chardev
subsystems are using atexit.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/vl.c b/vl.c
index 356713ea07..cad4da2487 100644
--- a/vl.c
+++ b/vl.c
@@ -4345,9 +4345,6 @@ int main(int argc, char **argv, char **envp)
         qemu_opts_del(icount_opts);
     }
 
-    /* clean up network at qemu process termination */
-    atexit(&net_cleanup);
-
     if (default_net) {
         QemuOptsList *net = qemu_find_opts("net");
         qemu_opts_set(net, NULL, "type", "nic", &error_abort);
@@ -4611,5 +4608,7 @@ int main(int argc, char **argv, char **envp)
     tpm_cleanup();
 #endif
 
+    net_cleanup();
+
     return 0;
 }