diff options
| -rw-r--r-- | curses.c | 3 | ||||
| -rw-r--r-- | hw/xen_backend.h | 2 | ||||
| -rw-r--r-- | hw/xen_devconfig.c | 2 | ||||
| -rw-r--r-- | hw/xen_domainbuild.c | 5 | ||||
| -rw-r--r-- | hw/xen_machine_pv.c | 3 | ||||
| -rw-r--r-- | qemu-char.c | 11 | ||||
| -rw-r--r-- | sdl.c | 5 | ||||
| -rw-r--r-- | vl.c | 7 |
8 files changed, 26 insertions, 12 deletions
@@ -338,6 +338,7 @@ static void curses_keyboard_setup(void) void curses_display_init(DisplayState *ds, int full_screen) { DisplayChangeListener *dcl; + static Notifier notifier = { .notify = curses_atexit }; #ifndef _WIN32 if (!isatty(1)) { fprintf(stderr, "We need a terminal output\n"); @@ -347,7 +348,7 @@ void curses_display_init(DisplayState *ds, int full_screen) curses_setup(); curses_keyboard_setup(); - atexit(curses_atexit); + exit_notifier_add(¬ifier); #ifndef _WIN32 #if defined(SIGWINCH) && defined(KEY_RESIZE) diff --git a/hw/xen_backend.h b/hw/xen_backend.h index f07f7d4224..991a7b7d54 100644 --- a/hw/xen_backend.h +++ b/hw/xen_backend.h @@ -97,7 +97,7 @@ extern struct XenDevOps xen_netdev_ops; /* xen_nic.c */ void xen_init_display(int domid); /* configuration (aka xenbus setup) */ -void xen_config_cleanup(void); +void xen_config_cleanup(Notifier *notifier); int xen_config_dev_blk(DriveInfo *disk); int xen_config_dev_nic(NICInfo *nic); int xen_config_dev_vfb(int vdev, const char *type); diff --git a/hw/xen_devconfig.c b/hw/xen_devconfig.c index ea8f8c4c2d..028f47ecb5 100644 --- a/hw/xen_devconfig.c +++ b/hw/xen_devconfig.c @@ -17,7 +17,7 @@ static void xen_config_cleanup_dir(char *dir) QTAILQ_INSERT_TAIL(&xs_cleanup, d, list); } -void xen_config_cleanup(void) +void xen_config_cleanup(Notifier *notifier) { struct xs_dirs *d; diff --git a/hw/xen_domainbuild.c b/hw/xen_domainbuild.c index 2f59856f73..b735ca453d 100644 --- a/hw/xen_domainbuild.c +++ b/hw/xen_domainbuild.c @@ -211,7 +211,7 @@ static int xen_domain_watcher(void) } /* normal cleanup */ -static void xen_domain_cleanup(void) +static void xen_domain_cleanup(Notifier *notifier) { char *dom; @@ -232,6 +232,7 @@ int xen_domain_build_pv(const char *kernel, const char *ramdisk, unsigned int xenstore_port = 0, console_port = 0; unsigned long xenstore_mfn = 0, console_mfn = 0; int rc; + static Notifier exit_notifier = { .notify = xen_domain_cleanup }; memcpy(uuid, qemu_uuid, sizeof(uuid)); rc = xc_domain_create(xen_xc, ssidref, uuid, flags, &xen_domid); @@ -240,7 +241,7 @@ int xen_domain_build_pv(const char *kernel, const char *ramdisk, goto err; } qemu_log("xen: created domain %d\n", xen_domid); - atexit(xen_domain_cleanup); + exit_notifier_add(&exit_notifier); if (xen_domain_watcher() == -1) { goto err; } diff --git a/hw/xen_machine_pv.c b/hw/xen_machine_pv.c index 162f88db33..abfa02c951 100644 --- a/hw/xen_machine_pv.c +++ b/hw/xen_machine_pv.c @@ -42,6 +42,7 @@ static void xen_init_pv(ram_addr_t ram_size, CPUState *env; DriveInfo *dinfo; int i; + static Notifier exit_notifier = { .notify = xen_config_cleanup }; /* Initialize a dummy CPU */ if (cpu_model == NULL) { @@ -105,7 +106,7 @@ static void xen_init_pv(ram_addr_t ram_size, } /* config cleanup hook */ - atexit(xen_config_cleanup); + exit_notifier_addr(&exit_notifier); /* setup framebuffer */ xen_init_display(xen_domid); diff --git a/qemu-char.c b/qemu-char.c index a3d6e64967..c02dfae43a 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -713,9 +713,15 @@ static void term_exit(void) fcntl(0, F_SETFL, old_fd0_flags); } +static void term_exit_notifier(Notifier *notifier) +{ + term_exit(); +} + static void term_init(QemuOpts *opts) { struct termios tty; + static Notifier exit_notifier = { .notify = term_exit_notifier }; tcgetattr (0, &tty); oldtty = tty; @@ -735,8 +741,9 @@ static void term_init(QemuOpts *opts) tcsetattr (0, TCSANOW, &tty); - if (!term_atexit_done++) - atexit(term_exit); + if (!term_atexit_done++) { + exit_notifier_add(&exit_notifier); + } fcntl(0, F_SETFL, O_NONBLOCK); } @@ -827,7 +827,7 @@ static void sdl_mouse_define(int width, int height, int bpp, SDL_SetCursor(guest_sprite); } -static void sdl_cleanup(void) +static void sdl_cleanup(Notifier *notifier) { if (guest_sprite) SDL_FreeCursor(guest_sprite); @@ -840,6 +840,7 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame) uint8_t data = 0; DisplayAllocator *da; const SDL_VideoInfo *vi; + static Notifier exit_notifier = { .notify = sdl_cleanup }; #if defined(__APPLE__) /* always use generic keymaps */ @@ -892,7 +893,7 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame) sdl_cursor_hidden = SDL_CreateCursor(&data, &data, 8, 1, 0, 0); sdl_cursor_normal = SDL_GetCursor(); - atexit(sdl_cleanup); + exit_notifier_add(&exit_notifier); if (full_screen) { gui_fullscreen = 1; gui_fullscreen_initial_grab = 1; @@ -533,7 +533,7 @@ static void configure_rtc(QemuOpts *opts) } #ifdef _WIN32 -static void socket_cleanup(void) +static void socket_cleanup(Notifier *obj) { WSACleanup(); } @@ -542,6 +542,7 @@ 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) { @@ -549,7 +550,7 @@ static int socket_init(void) fprintf(stderr, "WSAStartup: %d\n", err); return -1; } - atexit(socket_cleanup); + exit_notifier_add(¬ifier); return 0; } #endif @@ -3768,6 +3769,8 @@ int main(int argc, char **argv, char **envp) error_set_progname(argv[0]); + exit_notifier_init(); + init_clocks(); qemu_cache_utils_init(envp); |