jcs.org / qemu
qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio
fork atom

Makefile: Let the 'help' target list the helper targets

List the name of the helper targets when calling 'make help',
along with the tool targets:

$ make help
[...]

Helper targets:
fsdev/virtfs-proxy-helper - Build virtfs-proxy-helper
scsi/qemu-pr-helper - Build qemu-pr-helper
qemu-bridge-helper - Build qemu-bridge-helper
vhost-user-gpu - Build vhost-user-gpu
virtiofsd - Build virtiofsd

Tools targets:
qemu-ga - Build qemu-ga tool
qemu-keymap - Build qemu-keymap tool
elf2dmp - Build elf2dmp tool
ivshmem-client - Build ivshmem-client tool
ivshmem-server - Build ivshmem-server tool
qemu-nbd - Build qemu-nbd tool
qemu-storage-daemon - Build qemu-storage-daemon tool
qemu-img - Build qemu-img tool
qemu-io - Build qemu-io tool
qemu-edid - Build qemu-edid tool

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

authored by

Philippe Mathieu-Daudé and committed by
Paolo Bonzini fdbff6bd 78f8d497

+10 -4
+7 -2
Makefile
··· 336 336 LIBS+=-lz $(LIBS_TOOLS) 337 337 338 338 vhost-user-json-y = 339 - HELPERS-y = 339 + HELPERS-y = $(HELPERS) 340 340 341 - HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = qemu-bridge-helper$(EXESUF) 341 + HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) += qemu-bridge-helper$(EXESUF) 342 342 343 343 ifeq ($(CONFIG_LINUX)$(CONFIG_VIRGL)$(CONFIG_GBM)$(CONFIG_TOOLS),yyyy) 344 344 HELPERS-y += vhost-user-gpu$(EXESUF) ··· 1257 1257 $(if $(findstring softmmu,$(t)), \ 1258 1258 $(call print-help-run,$(t)/fuzz,Build fuzzer for $(t)); \ 1259 1259 ))) \ 1260 + echo '') 1261 + @$(if $(HELPERS-y), \ 1262 + echo 'Helper targets:'; \ 1263 + $(foreach t, $(HELPERS-y), \ 1264 + $(call print-help-run,$(t),Build $(shell basename $(t)));) \ 1260 1265 echo '') 1261 1266 @$(if $(TOOLS), \ 1262 1267 echo 'Tools targets:'; \
+3 -2
configure
··· 6394 6394 if test "$linux" = yes; then 6395 6395 if test "$virtfs" != no && test "$cap_ng" = yes && test "$attr" = yes ; then 6396 6396 virtfs=yes 6397 - tools="$tools fsdev/virtfs-proxy-helper\$(EXESUF)" 6397 + helpers="$helpers fsdev/virtfs-proxy-helper\$(EXESUF)" 6398 6398 else 6399 6399 if test "$virtfs" = yes; then 6400 6400 error_exit "VirtFS requires libcap-ng devel and libattr devel" ··· 6409 6409 fi 6410 6410 mpath=no 6411 6411 fi 6412 - tools="$tools scsi/qemu-pr-helper\$(EXESUF)" 6412 + helpers="$helpers scsi/qemu-pr-helper\$(EXESUF)" 6413 6413 else 6414 6414 if test "$virtfs" = yes; then 6415 6415 error_exit "VirtFS is supported only on Linux" ··· 7651 7651 QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg/\$(ARCH) $QEMU_INCLUDES" 7652 7652 fi 7653 7653 7654 + echo "HELPERS=$helpers" >> $config_host_mak 7654 7655 echo "TOOLS=$tools" >> $config_host_mak 7655 7656 echo "ROMS=$roms" >> $config_host_mak 7656 7657 echo "MAKE=$make" >> $config_host_mak