Re: [PATCH 31/32] RFC: Simplify softmmu/main.c

[Akihiko Odaki <akihiko.odaki@gmail.com>]

Reviewed-by: Akihiko Odaki <akihiko.odaki@gmail.com>

On 2022/03/24 0:57, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
> 
> Move qemu_main() declaration to a new header.
> 
> Simplify main.c since both cocoa & sdl cannot be enabled together.
> 
> (there might be some small conflict with the RFC patch "cocoa: run qemu_init
> in the main thread", but the two look like they could be used together
> to improve the code)
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>   include/qemu-common.h |  5 -----
>   include/qemu-main.h   |  6 ++++++
>   softmmu/main.c        | 25 +++++++++----------------
>   ui/cocoa.m            |  1 +
>   4 files changed, 16 insertions(+), 21 deletions(-)
>   create mode 100644 include/qemu-main.h
> 
> diff --git a/include/qemu-common.h b/include/qemu-common.h
> index 65483f70d4fe..0498acd16b78 100644
> --- a/include/qemu-common.h
> +++ b/include/qemu-common.h
> @@ -19,9 +19,4 @@
>       "See <https://qemu.org/contribute/report-a-bug> for how to report bugs.\n" \
>       "More information on the QEMU project at <https://qemu.org>."
>   
> -/* main function, renamed */
> -#if defined(CONFIG_COCOA)
> -int qemu_main(int argc, char **argv, char **envp);
> -#endif
> -
>   #endif
> diff --git a/include/qemu-main.h b/include/qemu-main.h
> new file mode 100644
> index 000000000000..74d670bbf9a7
> --- /dev/null
> +++ b/include/qemu-main.h
> @@ -0,0 +1,6 @@
> +#ifndef QEMU_MAIN_H
> +#define QEMU_MAIN_H
> +
> +int qemu_main(int argc, char **argv, char **envp);
> +
> +#endif /* QEMU_MAIN_H */
> diff --git a/softmmu/main.c b/softmmu/main.c
> index 639c67ff4893..c00432ff098e 100644
> --- a/softmmu/main.c
> +++ b/softmmu/main.c
> @@ -23,28 +23,14 @@
>    */
>   
>   #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>
> -static int qemu_main(int argc, char **argv, char **envp);
> -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_main(int argc, char **argv, char **envp)
>   {
>       qemu_init(argc, argv, envp);
>       qemu_main_loop();
> @@ -52,3 +38,10 @@ int main(int argc, char **argv, char **envp)
>   
>       return 0;
>   }
> +
> +#ifndef CONFIG_COCOA
> +int main(int argc, char **argv)
> +{
> +    return qemu_main(argc, argv, NULL);
> +}
> +#endif
> diff --git a/ui/cocoa.m b/ui/cocoa.m
> index cb6e7c41dc6f..e566372b8f73 100644
> --- a/ui/cocoa.m
> +++ b/ui/cocoa.m
> @@ -28,6 +28,7 @@
>   #include <crt_externs.h>
>   
>   #include "qemu-common.h"
> +#include "qemu-main.h"
>   #include "ui/clipboard.h"
>   #include "ui/console.h"
>   #include "ui/input.h"