motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-03 07:43:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Convert atexit users to exit_notifier"

Browse source 
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:
Anthony Liguori 2010-03-21 14:13:02 -05:00
parent 365c4243ec
commit 28695489e3
8 changed files with 12 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

7
vl.c
View file

@ -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);