pflash_cfi02: fix incorrect TARGET_FMT_lx/d use

[qemu.git] / vl.c

diff --git a/vl.c b/vl.c
index eda96aaa6c5f81a0046346471bbabe5fdeb56f1f..f12363cd640cfaea5675439348b99564000e99b6 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -150,7 +150,6 @@ int main(int argc, char **argv)
 #include "qemu-option.h"
 #include "qemu-config.h"
 #include "qemu-objects.h"
-#include "notify.h"
 
 #include "disas.h"
 
@@ -208,8 +207,8 @@ int no_quit = 0;
 CharDriverState *serial_hds[MAX_SERIAL_PORTS];
 CharDriverState *parallel_hds[MAX_PARALLEL_PORTS];
 CharDriverState *virtcon_hds[MAX_VIRTIO_CONSOLES];
-#ifdef TARGET_I386
 int win2k_install_hack = 0;
+#ifdef TARGET_I386
 int rtc_td_hack = 0;
 #endif
 int usb_enabled = 0;
@@ -533,7 +532,7 @@ static void configure_rtc(QemuOpts *opts)
 }
 
 #ifdef _WIN32
-static void socket_cleanup(Notifier *obj)
+static void socket_cleanup(void)
 {
     WSACleanup();
 }
@@ -542,7 +541,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) {
@@ -550,37 +548,11 @@ static int socket_init(void)
         fprintf(stderr, "WSAStartup: %d\n", err);
         return -1;
     }
-    exit_notifier_add(&notifier);
+    atexit(socket_cleanup);
     return 0;
 }
 #endif
 
-/*********************/
-/* Exit notifiers    */
-/*********************/
-
-static NotifierList exit_notifiers = NOTIFIER_LIST_INITIALIZER(exit_notifiers);
-
-void exit_notifier_add(Notifier *notifier)
-{
-    notifier_list_add(&exit_notifiers, notifier);
-}
-
-void exit_notifier_remove(Notifier *notifier)
-{
-    notifier_list_remove(&exit_notifiers, notifier);
-}
-
-static void exit_notifier_notify(void)
-{
-    notifier_list_notify(&exit_notifiers);
-}
-
-static void exit_notifier_init(void)
-{
-    atexit(exit_notifier_notify);
-}
-
 /***********************************************************/
 /* Bluetooth support */
 static int nb_hcis;
@@ -3769,8 +3741,6 @@ int main(int argc, char **argv, char **envp)
 
     error_set_progname(argv[0]);
 
-    exit_notifier_init();
-
     init_clocks();
 
     qemu_cache_utils_init(envp);