[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 15/20] fuzz: add target/fuzz makefile rules
From: |
Bulekov, Alexander |
Subject: |
[PATCH v7 15/20] fuzz: add target/fuzz makefile rules |
Date: |
Mon, 20 Jan 2020 05:55:02 +0000 |
Signed-off-by: Alexander Bulekov <address@hidden>
Reviewed-by: Darren Kenny <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
---
Makefile | 15 ++++++++++++++-
Makefile.objs | 2 +-
Makefile.target | 16 ++++++++++++++++
3 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index e6de7a47bb..dab291455f 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)
@@ -478,6 +478,15 @@ ifdef DECOMPRESS_EDK2_BLOBS
$(SOFTMMU_ALL_RULES): $(edk2-decompressed)
endif
+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
@@ -528,6 +537,9 @@ subdir-slirp: slirp/all
$(filter %/all, $(TARGET_DIRS_RULES)): libqemuutil.a $(common-obj-y) \
$(qom-obj-y)
+$(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
@@ -537,6 +549,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 5ab166fed5..9d87a1009e 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -84,8 +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 8dcf3dddd8..fd6fe79495 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -227,6 +227,22 @@ ifdef CONFIG_TRACE_SYSTEMTAP
rm -f *.stp
endif
+ifdef CONFIG_FUZZ
+include $(SRC_PATH)/tests/qtest/fuzz/Makefile.include
+include $(SRC_PATH)/tests/qtest/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, $^))
+
+endif
+
install: all
ifneq ($(PROGS),)
$(call install-prog,$(PROGS),$(DESTDIR)$(bindir))
--
2.23.0
- [PATCH v7 08/20] libqos: split qos-test and libqos makefile vars, (continued)
- [PATCH v7 08/20] libqos: split qos-test and libqos makefile vars, Bulekov, Alexander, 2020/01/20
- [PATCH v7 09/20] libqos: split qos-test and libqos makefile vars, Bulekov, Alexander, 2020/01/20
- [PATCH v7 09/20] libqos: move useful qos-test funcs to qos_external, Bulekov, Alexander, 2020/01/20
- [PATCH v7 10/20] libqtest: make bufwrite rely on the TransportOps, Bulekov, Alexander, 2020/01/20
- [PATCH v7 10/20] libqos: move useful qos-test funcs to qos_external, Bulekov, Alexander, 2020/01/20
- [PATCH v7 11/20] fuzz: add fuzzer skeleton, Bulekov, Alexander, 2020/01/20
- [PATCH v7 12/20] exec: keep ram block across fork when using qtest, Bulekov, Alexander, 2020/01/20
- [PATCH v7 13/20] fuzz: support for fork-based fuzzing., Bulekov, Alexander, 2020/01/20
- [PATCH v7 14/20] fuzz: add support for qos-assisted fuzz targets, Bulekov, Alexander, 2020/01/20
- [PATCH v7 15/20] fuzz: add target/fuzz makefile rules,
Bulekov, Alexander <=
- [PATCH v7 17/20] fuzz: add documentation to docs/devel/, Bulekov, Alexander, 2020/01/20
- [PATCH v7 16/20] fuzz: add configure flag --enable-fuzzing, Bulekov, Alexander, 2020/01/20
- [PATCH v7 18/20] fuzz: add virtio-net fuzz target, Bulekov, Alexander, 2020/01/20
- [PATCH v7 17/20] fuzz: add i440fx fuzz targets, Bulekov, Alexander, 2020/01/20
- [PATCH v7 18/20] fuzz: add i440fx fuzz targets, Bulekov, Alexander, 2020/01/20
- [PATCH v7 19/20] fuzz: add virtio-scsi fuzz target, Bulekov, Alexander, 2020/01/20
- [PATCH v7 19/20] fuzz: add virtio-net fuzz target, Bulekov, Alexander, 2020/01/20
- [PATCH v7 20/20] fuzz: add documentation to docs/devel/, Bulekov, Alexander, 2020/01/20