ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

main: Cleanup

This commit is contained in:
Matt Borgerson 2023-01-23 00:30:40 -07:00
parent d981ca9409
commit 93b2a408fb
2 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
softmmu/main.c
View File

@ -26,26 +26,11 @@
#include "qemu-main.h" #include "qemu-main.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#ifdef XBOX #ifndef XBOX
#undef main
int qemu_main(int argc, char **argv)
{
int status;
qemu_init(argc, argv);
status = qemu_main_loop();
qemu_cleanup();
return status;
}
#else
#ifdef CONFIG_SDL #ifdef CONFIG_SDL
#include <SDL.h> #include <SDL.h>
#endif #endif
#endif
int qemu_default_main(void) int qemu_default_main(void)
{ {
@ -59,10 +44,10 @@ int qemu_default_main(void)
int (*qemu_main)(void) = qemu_default_main; int (*qemu_main)(void) = qemu_default_main;
#ifndef XBOX
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
qemu_init(argc, argv); qemu_init(argc, argv);
return qemu_main(); return qemu_main();
} }
#endif
#endif // ifdef XBOX

5
ui/xemu.c
View File

@ -33,6 +33,7 @@
#include "qemu/main-loop.h" #include "qemu/main-loop.h"
#include "qemu/rcu.h" #include "qemu/rcu.h"
#include "qemu-version.h" #include "qemu-version.h"
#include "qemu-main.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qapi-commands-block.h" #include "qapi/qapi-commands-block.h"
#include "qapi/qmp/qdict.h" #include "qapi/qmp/qdict.h"
@ -1427,14 +1428,14 @@ int gArgc;
char **gArgv; char **gArgv;
// vl.c // vl.c
int qemu_main(int argc, char **argv, char **envp);
static void *call_qemu_main(void *opaque) static void *call_qemu_main(void *opaque)
{ {
int status; int status;
DPRINTF("Second thread: calling qemu_main()\n"); DPRINTF("Second thread: calling qemu_main()\n");
status = qemu_main(gArgc, gArgv, NULL); qemu_init(gArgc, gArgv);
status = qemu_main();
DPRINTF("Second thread: qemu_main() returned, exiting\n"); DPRINTF("Second thread: qemu_main() returned, exiting\n");
exit(status); exit(status);
} }