Re: [PATCH v4 14/20] fuzz: Add target/fuzz makefile rules

[Darren Kenny]

On Wed, Oct 30, 2019 at 02:50:00PM +0000, Oleinik, Alexander wrote:
> From: Alexander Oleinik <address@hidden>
>
> Signed-off-by: Alexander Oleinik <address@hidden>
> ---
> Makefile                    | 15 ++++++++++++++-
> Makefile.objs               |  4 +++-
> Makefile.target             | 18 +++++++++++++++++-
> tests/fuzz/Makefile.include |  4 ++++
> 4 files changed, 38 insertions(+), 3 deletions(-)
> create mode 100644 tests/fuzz/Makefile.include
>
> diff --git a/Makefile b/Makefile
> index d2b2ecd3c4..571f5562c9 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -464,7 +464,7 @@ config-host.h-timestamp: config-host.mak
> qemu-options.def: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool
>         $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > 
> $@,"GEN","$@")
>
> -TARGET_DIRS_RULES := $(foreach t, all clean install, $(addsuffix /$(t), 
> $(TARGET_DIRS)))
> +TARGET_DIRS_RULES := $(foreach t, all fuzz clean install, $(addsuffix /$(t), 
> $(TARGET_DIRS)))
>
> SOFTMMU_ALL_RULES=$(filter %-softmmu/all, $(TARGET_DIRS_RULES))
> $(SOFTMMU_ALL_RULES): $(authz-obj-y)
> @@ -476,6 +476,15 @@ $(SOFTMMU_ALL_RULES): config-all-devices.mak
> $(SOFTMMU_ALL_RULES): $(edk2-decompressed)
> $(SOFTMMU_ALL_RULES): $(softmmu-main-y)
>
> +SOFTMMU_FUZZ_RULES=$(filter %-softmmu/fuzz, $(TARGET_DIRS_RULES))
> +$(SOFTMMU_FUZZ_RULES): $(authz-obj-y)
> +$(SOFTMMU_FUZZ_RULES): $(block-obj-y)
> +$(SOFTMMU_FUZZ_RULES): $(chardev-obj-y)
> +$(SOFTMMU_FUZZ_RULES): $(crypto-obj-y)
> +$(SOFTMMU_FUZZ_RULES): $(io-obj-y)
> +$(SOFTMMU_FUZZ_RULES): config-all-devices.mak
> +$(SOFTMMU_FUZZ_RULES): $(edk2-decompressed)
> +
> .PHONY: $(TARGET_DIRS_RULES)
> # The $(TARGET_DIRS_RULES) are of the form SUBDIR/GOAL, so that
> # $(dir $@) yields the sub-directory, and $(notdir $@) yields the sub-goal
> @@ -526,6 +535,9 @@ subdir-slirp: slirp/all
> $(filter %/all, $(TARGET_DIRS_RULES)): libqemuutil.a $(common-obj-y) \
>         $(qom-obj-y) $(crypto-user-obj-$(CONFIG_USER_ONLY))
>
> +$(filter %/fuzz, $(TARGET_DIRS_RULES)): libqemuutil.a $(common-obj-y) \
> +       $(qom-obj-y) $(crypto-user-obj-$(CONFIG_USER_ONLY))
> +
> ROM_DIRS = $(addprefix pc-bios/, $(ROMS))
> ROM_DIRS_RULES=$(foreach t, all clean, $(addsuffix /$(t), $(ROM_DIRS)))
> # Only keep -O and -g cflags
> @@ -535,6 +547,7 @@ $(ROM_DIRS_RULES):
>
> .PHONY: recurse-all recurse-clean recurse-install
> recurse-all: $(addsuffix /all, $(TARGET_DIRS) $(ROM_DIRS))
> +recurse-fuzz: $(addsuffix /fuzz, $(TARGET_DIRS) $(ROM_DIRS))
> recurse-clean: $(addsuffix /clean, $(TARGET_DIRS) $(ROM_DIRS))
> recurse-install: $(addsuffix /install, $(TARGET_DIRS))
> $(addsuffix /install, $(TARGET_DIRS)): all
> diff --git a/Makefile.objs b/Makefile.objs
> index 9ff9b0c6f9..5478a554f6 100644
> --- a/Makefile.objs
> +++ b/Makefile.objs
> @@ -86,10 +86,12 @@ common-obj-$(CONFIG_FDT) += device_tree.o
> # qapi
>
> common-obj-y += qapi/
> +softmmu-obj-y = main.o
>
> -softmmu-main-y = main.o
> endif
>
> +
> +
> #######################################################################
> # Target-independent parts used in system and user emulation
> common-obj-y += cpus-common.o
> diff --git a/Makefile.target b/Makefile.target
> index ca3d14efe1..cddc8e4306 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)$@")
> @@ -227,6 +227,22 @@ ifdef CONFIG_TRACE_SYSTEMTAP
>         rm -f *.stp
> endif
>
> +ifdef CONFIG_FUZZ
> +include $(SRC_PATH)/tests/fuzz/Makefile.include
> +include $(SRC_PATH)/tests/Makefile.include
> +
> +fuzz: fuzz-vars
> +fuzz-vars: QEMU_CFLAGS := $(FUZZ_CFLAGS) $(QEMU_CFLAGS)
> +fuzz-vars: QEMU_LDFLAGS := $(FUZZ_LDFLAGS) $(QEMU_LDFLAGS)
> +fuzz-vars: $(QEMU_PROG_FUZZ)
> +dummy := $(call unnest-vars,, fuzz-obj-y)
> +
> +
> +$(QEMU_PROG_FUZZ): config-devices.mak $(all-obj-y) $(COMMON_LDADDS) 
> $(fuzz-obj-y)
> +       $(call LINK, $(filter-out %.mak, $^))
> +

It may be useful to still handle the fuzz target here, and report
that fuzzing is disabled in this configuration, as it is, if I type
'make x86_64-softmmu/fuzz' I get the less useful output of:

  make[1]: *** No rule to make target `fuzz'.  Stop.

> +endif
> +
> install: all
> ifneq ($(PROGS),)
>         $(call install-prog,$(PROGS),$(DESTDIR)$(bindir))
> diff --git a/tests/fuzz/Makefile.include b/tests/fuzz/Makefile.include
> new file mode 100644
> index 0000000000..324e6c1433
> --- /dev/null
> +++ b/tests/fuzz/Makefile.include
> @@ -0,0 +1,4 @@
> +# QEMU_PROG_FUZZ=qemu-fuzz-$(TARGET_NAME)$(EXESUF)
> +fuzz-obj-y = $(libqos-obj-y)
> +fuzz-obj-y += tests/libqtest.o
> +

But otherwise, this seems to be cleaner in that it is not causing
rebuilds of objects between selecting target/all or target/fuzz,
assuming that is correct here.

So with that,

Reviewed-by: Darren Kenny <address@hidden>

Thanks,

Darren.