mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-01 14:53:54 -06:00
Revert "Convert atexit users to exit_notifier"
This reverts commit d7234f4d7e
.
Conflicts:
hw/xen_machine_pv.c
This should have never been committed.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
365c4243ec
commit
28695489e3
8 changed files with 12 additions and 26 deletions
5
sdl.c
5
sdl.c
|
@ -827,7 +827,7 @@ static void sdl_mouse_define(int width, int height, int bpp,
|
|||
SDL_SetCursor(guest_sprite);
|
||||
}
|
||||
|
||||
static void sdl_cleanup(Notifier *notifier)
|
||||
static void sdl_cleanup(void)
|
||||
{
|
||||
if (guest_sprite)
|
||||
SDL_FreeCursor(guest_sprite);
|
||||
|
@ -840,7 +840,6 @@ 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 */
|
||||
|
@ -893,7 +892,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();
|
||||
|
||||
exit_notifier_add(&exit_notifier);
|
||||
atexit(sdl_cleanup);
|
||||
if (full_screen) {
|
||||
gui_fullscreen = 1;
|
||||
gui_fullscreen_initial_grab = 1;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue