travis-ci: Correct invalid mentions of 'softmmu' by 'system'

[mirror_qemu.git] / softmmu / main.c

diff --git a/softmmu/main.c b/softmmu/main.c
index 7adc530c736029c1e9ceccce7154645f4983cecf..694388bd7f7f6785c2e753b184fc2bd2e77bf296 100644 (file)
--- a/softmmu/main.c
+++ b/softmmu/main.c
@@ -23,31 +23,27 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu-main.h"
 #include "sysemu/sysemu.h"
 
 #ifdef CONFIG_SDL
-#if defined(__APPLE__) || defined(main)
 #include <SDL.h>
-int main(int argc, char **argv)
-{
-    return qemu_main(argc, argv, NULL);
-}
-#undef main
-#define main qemu_main
 #endif
-#endif /* CONFIG_SDL */
 
-#ifdef CONFIG_COCOA
-#undef main
-#define main qemu_main
-#endif /* CONFIG_COCOA */
-
-int main(int argc, char **argv, char **envp)
+int qemu_default_main(void)
 {
-    qemu_init(argc, argv, envp);
-    qemu_main_loop();
+    int status;
+
+    status = qemu_main_loop();
     qemu_cleanup();
 
-    return 0;
+    return status;
+}
+
+int (*qemu_main)(void) = qemu_default_main;
+
+int main(int argc, char **argv)
+{
+    qemu_init(argc, argv);
+    return qemu_main();
 }