From 93b2a408fb07d815607e84355a3f6cbee8efe208 Mon Sep 17 00:00:00 2001
From: Matt Borgerson <contact@mborgerson.com>
Date: Mon, 23 Jan 2023 00:30:40 -0700
Subject: [PATCH] main: Cleanup

---
 softmmu/main.c | 23 ++++-------------------
 ui/xemu.c      |  5 +++--
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/softmmu/main.c b/softmmu/main.c
index 9ac4e2216e..e84cdc9438 100644
--- a/softmmu/main.c
+++ b/softmmu/main.c
@@ -26,26 +26,11 @@
 #include "qemu-main.h"
 #include "sysemu/sysemu.h"
 
-#ifdef 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
-
+#ifndef XBOX
 #ifdef CONFIG_SDL
 #include <SDL.h>
 #endif
+#endif
 
 int qemu_default_main(void)
 {
@@ -59,10 +44,10 @@ int qemu_default_main(void)
 
 int (*qemu_main)(void) = qemu_default_main;
 
+#ifndef XBOX
 int main(int argc, char **argv)
 {
     qemu_init(argc, argv);
     return qemu_main();
 }
-
-#endif // ifdef XBOX
+#endif
\ No newline at end of file
diff --git a/ui/xemu.c b/ui/xemu.c
index 90ceb87a70..037ee17a9c 100644
--- a/ui/xemu.c
+++ b/ui/xemu.c
@@ -33,6 +33,7 @@
 #include "qemu/main-loop.h"
 #include "qemu/rcu.h"
 #include "qemu-version.h"
+#include "qemu-main.h"
 #include "qapi/error.h"
 #include "qapi/qapi-commands-block.h"
 #include "qapi/qmp/qdict.h"
@@ -1427,14 +1428,14 @@ int gArgc;
 char **gArgv;
 
 // vl.c
-int qemu_main(int argc, char **argv, char **envp);
 
 static void *call_qemu_main(void *opaque)
 {
     int status;
 
     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");
     exit(status);
 }