summary refs log tree commit diff stats
path: root/vl.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2010-03-21 14:13:02 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2010-03-21 14:13:02 -0500
commit28695489e392e2bd34cf4ccf8611d431808e084c (patch)
tree8edbda8b30cb4bbbd4636c1c9dbb8c6ecead181a /vl.c
parent365c4243ecdd0eb2372ce4a5bb20ded77c755c1d (diff)
downloadfocaccia-qemu-28695489e392e2bd34cf4ccf8611d431808e084c.tar.gz
focaccia-qemu-28695489e392e2bd34cf4ccf8611d431808e084c.zip
Revert "Convert atexit users to exit_notifier"
This reverts commit d7234f4d7e373a708e1df9ab565a71b71b189025.

Conflicts:

	hw/xen_machine_pv.c

This should have never been committed.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'vl.c')
-rw-r--r--vl.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/vl.c b/vl.c
index 8274c1ddda..26b638c11d 100644
--- a/vl.c
+++ b/vl.c
@@ -537,7 +537,7 @@ static void configure_rtc(QemuOpts *opts)
 }
 
 #ifdef _WIN32
-static void socket_cleanup(Notifier *obj)
+static void socket_cleanup(void)
 {
     WSACleanup();
 }
@@ -546,7 +546,6 @@ static int socket_init(void)
 {
     WSADATA Data;
     int ret, err;
-    static Notifier notifier = { .notify = socket_cleanup };
 
     ret = WSAStartup(MAKEWORD(2,2), &Data);
     if (ret != 0) {
@@ -554,7 +553,7 @@ static int socket_init(void)
         fprintf(stderr, "WSAStartup: %d\n", err);
         return -1;
     }
-    exit_notifier_add(&notifier);
+    atexit(socket_cleanup);
     return 0;
 }
 #endif
@@ -3803,8 +3802,6 @@ int main(int argc, char **argv, char **envp)
 
     error_set_progname(argv[0]);
 
-    exit_notifier_init();
-
     init_clocks();
 
     qemu_cache_utils_init(envp);