Re: [PATCH v8 01/21] softmmu: split off vl.c:main() into main.c

[Darren Kenny]

On Wed, Jan 29, 2020 at 05:34:11AM +0000, Bulekov, Alexander wrote:
> A program might rely on functions implemented in vl.c, but implement its
> own main(). By placing main into a separate source file, there are no
> complaints about duplicate main()s when linking against vl.o. For
> example, the virtual-device fuzzer uses a main() provided by libfuzzer,
> and needs to perform some initialization before running the softmmu
> initialization. Now, main simply calls three vl.c functions which
> handle the guest initialization, main loop and cleanup.
>
> Signed-off-by: Alexander Bulekov <address@hidden>
> ---
> Makefile                |  1 +
> Makefile.objs           |  2 ++
> Makefile.target         |  2 +-
> include/sysemu/sysemu.h |  4 ++++
> main.c                  | 53 +++++++++++++++++++++++++++++++++++++++++
> vl.c                    | 36 +++++++---------------------
> 6 files changed, 70 insertions(+), 28 deletions(-)
> create mode 100644 main.c
>
> diff --git a/Makefile b/Makefile
> index 32bd554480..e6de7a47bb 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -473,6 +473,7 @@ $(SOFTMMU_ALL_RULES): $(chardev-obj-y)
> $(SOFTMMU_ALL_RULES): $(crypto-obj-y)
> $(SOFTMMU_ALL_RULES): $(io-obj-y)
> $(SOFTMMU_ALL_RULES): config-all-devices.mak
> +$(SOFTMMU_ALL_RULES): $(softmmu-main-y)
> ifdef DECOMPRESS_EDK2_BLOBS
> $(SOFTMMU_ALL_RULES): $(edk2-decompressed)
> endif
> diff --git a/Makefile.objs b/Makefile.objs
> index 7c1e50f9d6..5ab166fed5 100644
> --- a/Makefile.objs
> +++ b/Makefile.objs
> @@ -84,6 +84,8 @@ common-obj-$(CONFIG_FDT) += device_tree.o
> # qapi
>
> common-obj-y += qapi/
> +
> +softmmu-obj-y = main.o
> endif
>
> #######################################################################
> diff --git a/Makefile.target b/Makefile.target
> index 6e61f607b1..8dcf3dddd8 100644
> --- a/Makefile.target
> +++ b/Makefile.target
> @@ -202,7 +202,7 @@ endif
> COMMON_LDADDS = ../libqemuutil.a
>
> # build either PROG or PROGW
> -$(QEMU_PROG_BUILD): $(all-obj-y) $(COMMON_LDADDS)
> +$(QEMU_PROG_BUILD): $(all-obj-y) $(COMMON_LDADDS) $(softmmu-obj-y)
>         $(call LINK, $(filter-out %.mak, $^))
> ifdef CONFIG_DARWIN
>         $(call quiet-command,Rez -append $(SRC_PATH)/pc-bios/qemu.rsrc -o 
> $@,"REZ","$(TARGET_DIR)$@")
> diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
> index 80c57fdc4e..270df5fa34 100644
> --- a/include/sysemu/sysemu.h
> +++ b/include/sysemu/sysemu.h
> @@ -118,6 +118,10 @@ QemuOpts *qemu_get_machine_opts(void);
>
> bool defaults_enabled(void);
>
> +void qemu_init(int argc, char **argv, char **envp);
> +void qemu_main_loop(void);
> +void qemu_cleanup(void);
> +
> extern QemuOptsList qemu_legacy_drive_opts;
> extern QemuOptsList qemu_common_drive_opts;
> extern QemuOptsList qemu_drive_opts;
> diff --git a/main.c b/main.c
> new file mode 100644
> index 0000000000..f10ceda541
> --- /dev/null
> +++ b/main.c
> @@ -0,0 +1,53 @@
> +/*
> + * QEMU System Emulator
> + *
> + * Copyright (c) 2003-2008 Fabrice Bellard

I don't know the rules but, maybe that should also be extended to
2019/2020 since this is a new file.

Otherwise,

Reviewed-by: Darren Kenny <address@hidden>

Thanks,

Darren.