1. Patchew
  2. QEMU
  3. [Qemu-devel] [PULL 0/6] Some docker updates
  4. View patch

[Qemu-devel] [PULL 3/6] Makefile: Rename TARGET_DIRS to TARGET_LIST

Alex Bennée posted 6 patches 7 years, 8 months ago
Only 3 patches received!
[Qemu-devel] [PULL 3/6] Makefile: Rename TARGET_DIRS to TARGET_LIST
Posted by Alex Bennée 7 years, 8 months ago 
From: Fam Zheng <famz@redhat.com>

To be more accurate on its purpose and make code that looks for a certain
target out of this variable more readable.

Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

diff --git a/Makefile b/Makefile
index 6d588d1f71..023b3437ec 100644
--- a/Makefile
+++ b/Makefile
@@ -62,8 +62,8 @@ seems to have been used for an in-tree build. You can fix this by running \
 endif
 endif
 
-CONFIG_SOFTMMU := $(if $(filter %-softmmu,$(TARGET_DIRS)),y)
-CONFIG_USER_ONLY := $(if $(filter %-user,$(TARGET_DIRS)),y)
+CONFIG_SOFTMMU := $(if $(filter %-softmmu,$(TARGET_LIST)),y)
+CONFIG_USER_ONLY := $(if $(filter %-user,$(TARGET_LIST)),y)
 CONFIG_XEN := $(CONFIG_XEN_BACKEND)
 CONFIG_ALL=y
 -include config-all-devices.mak
@@ -366,8 +366,8 @@ DOCS=
 endif
 
 SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory --quiet) BUILD_DIR=$(BUILD_DIR)
-SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_DIRS))
-SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %-config-devices.mak.d, $(TARGET_DIRS))
+SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_LIST))
+SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %-config-devices.mak.d, $(TARGET_LIST))
 
 ifeq ($(SUBDIR_DEVICES_MAK),)
 config-all-devices.mak:
@@ -470,7 +470,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","$@")
 
-SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS))
+SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_LIST))
 SOFTMMU_SUBDIR_RULES=$(filter %-softmmu,$(SUBDIR_RULES))
 
 $(SOFTMMU_SUBDIR_RULES): $(block-obj-y)
@@ -514,7 +514,7 @@ ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS))
 romsubdir-%:
 	$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C pc-bios/$* V="$(V)" TARGET_DIR="$*/" CFLAGS="$(filter -O% -g%,$(CFLAGS))",)
 
-ALL_SUBDIRS=$(TARGET_DIRS) $(patsubst %,pc-bios/%, $(ROMS))
+ALL_SUBDIRS=$(TARGET_LIST) $(patsubst %,pc-bios/%, $(ROMS))
 
 recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES)
 
@@ -772,7 +772,7 @@ distclean: clean
 	rm -f docs/interop/qemu-qmp-ref.pdf docs/interop/qemu-ga-ref.pdf
 	rm -f docs/interop/qemu-qmp-ref.html docs/interop/qemu-ga-ref.html
 	rm -f docs/qemu-block-drivers.7
-	for d in $(TARGET_DIRS); do \
+	for d in $(TARGET_LIST); do \
 	rm -rf $$d || exit 1 ; \
         done
 	rm -Rf .sdk
@@ -873,7 +873,7 @@ endif
 		$(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadir)/keymaps"; \
 	done
 	$(INSTALL_DATA) $(BUILD_DIR)/trace-events-all "$(DESTDIR)$(qemu_datadir)/trace-events-all"
-	for d in $(TARGET_DIRS); do \
+	for d in $(TARGET_LIST); do \
 	$(MAKE) $(SUBDIR_MAKEFLAGS) TARGET_DIR=$$d/ -C $$d $@ || exit 1 ; \
         done
 
@@ -1071,9 +1071,9 @@ endif
 	@echo  '  ctags/TAGS      - Generate tags file for editors'
 	@echo  '  cscope          - Generate cscope index'
 	@echo  ''
-	@$(if $(TARGET_DIRS), \
+	@$(if $(TARGET_LIST), \
 		echo 'Architecture specific targets:'; \
-		$(foreach t, $(TARGET_DIRS), \
+		$(foreach t, $(TARGET_LIST), \
 		printf "  %-30s - Build for %s\\n" $(patsubst %,subdir-%,$(t)) $(t);) \
 		echo '')
 	@echo  'Cleaning targets:'
diff --git a/configure b/configure
index db8c9d8288..14b11130a7 100755
--- a/configure
+++ b/configure
@@ -6128,7 +6128,7 @@ qemu_version=$(head $source_path/VERSION)
 echo "VERSION=$qemu_version" >>$config_host_mak
 echo "PKGVERSION=$pkgversion" >>$config_host_mak
 echo "SRC_PATH=$source_path" >> $config_host_mak
-echo "TARGET_DIRS=$target_list" >> $config_host_mak
+echo "TARGET_LIST=$target_list" >> $config_host_mak
 if [ "$docs" = "yes" ] ; then
   echo "BUILD_DOCS=yes" >> $config_host_mak
 fi
diff --git a/scripts/create_config b/scripts/create_config
index d727e5e36e..58948a67a4 100755
--- a/scripts/create_config
+++ b/scripts/create_config
@@ -107,7 +107,7 @@ case $line in
     target_name=${line#*=}
     echo "#define TARGET_NAME \"$target_name\""
     ;;
- TARGET_DIRS=*)
+ TARGET_LIST=*)
     # do nothing
     ;;
  TARGET_*=y) # configuration
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 86f90c0cb0..9854e7794b 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -858,7 +858,7 @@ endif
 
 # QTest rules
 
-TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_DIRS)))
+TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_LIST)))
 ifeq ($(CONFIG_POSIX),y)
 QTEST_TARGETS = $(TARGETS)
 check-qtest-y=$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET)-y))
-- 
2.17.0
Re: [Qemu-devel] [PULL 3/6] Makefile: Rename TARGET_DIRS to TARGET_LIST
Posted by Paolo Bonzini 7 years, 7 months ago 
On 05/06/2018 18:05, Alex Bennée wrote:
> From: Fam Zheng <famz@redhat.com>
> 
> To be more accurate on its purpose and make code that looks for a certain
> target out of this variable more readable.

This breaks the Docker mingw build, because the full list of targets
used on the host is passed to the container.  This includes linux-user
targets which do not exist on non-Linux.

Paolo

> Signed-off-by: Fam Zheng <famz@redhat.com>
> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> 
> diff --git a/Makefile b/Makefile
> index 6d588d1f71..023b3437ec 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -62,8 +62,8 @@ seems to have been used for an in-tree build. You can fix this by running \
>  endif
>  endif
>  
> -CONFIG_SOFTMMU := $(if $(filter %-softmmu,$(TARGET_DIRS)),y)
> -CONFIG_USER_ONLY := $(if $(filter %-user,$(TARGET_DIRS)),y)
> +CONFIG_SOFTMMU := $(if $(filter %-softmmu,$(TARGET_LIST)),y)
> +CONFIG_USER_ONLY := $(if $(filter %-user,$(TARGET_LIST)),y)
>  CONFIG_XEN := $(CONFIG_XEN_BACKEND)
>  CONFIG_ALL=y
>  -include config-all-devices.mak
> @@ -366,8 +366,8 @@ DOCS=
>  endif
>  
>  SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory --quiet) BUILD_DIR=$(BUILD_DIR)
> -SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_DIRS))
> -SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %-config-devices.mak.d, $(TARGET_DIRS))
> +SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_LIST))
> +SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %-config-devices.mak.d, $(TARGET_LIST))
>  
>  ifeq ($(SUBDIR_DEVICES_MAK),)
>  config-all-devices.mak:
> @@ -470,7 +470,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","$@")
>  
> -SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS))
> +SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_LIST))
>  SOFTMMU_SUBDIR_RULES=$(filter %-softmmu,$(SUBDIR_RULES))
>  
>  $(SOFTMMU_SUBDIR_RULES): $(block-obj-y)
> @@ -514,7 +514,7 @@ ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS))
>  romsubdir-%:
>  	$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C pc-bios/$* V="$(V)" TARGET_DIR="$*/" CFLAGS="$(filter -O% -g%,$(CFLAGS))",)
>  
> -ALL_SUBDIRS=$(TARGET_DIRS) $(patsubst %,pc-bios/%, $(ROMS))
> +ALL_SUBDIRS=$(TARGET_LIST) $(patsubst %,pc-bios/%, $(ROMS))
>  
>  recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES)
>  
> @@ -772,7 +772,7 @@ distclean: clean
>  	rm -f docs/interop/qemu-qmp-ref.pdf docs/interop/qemu-ga-ref.pdf
>  	rm -f docs/interop/qemu-qmp-ref.html docs/interop/qemu-ga-ref.html
>  	rm -f docs/qemu-block-drivers.7
> -	for d in $(TARGET_DIRS); do \
> +	for d in $(TARGET_LIST); do \
>  	rm -rf $$d || exit 1 ; \
>          done
>  	rm -Rf .sdk
> @@ -873,7 +873,7 @@ endif
>  		$(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadir)/keymaps"; \
>  	done
>  	$(INSTALL_DATA) $(BUILD_DIR)/trace-events-all "$(DESTDIR)$(qemu_datadir)/trace-events-all"
> -	for d in $(TARGET_DIRS); do \
> +	for d in $(TARGET_LIST); do \
>  	$(MAKE) $(SUBDIR_MAKEFLAGS) TARGET_DIR=$$d/ -C $$d $@ || exit 1 ; \
>          done
>  
> @@ -1071,9 +1071,9 @@ endif
>  	@echo  '  ctags/TAGS      - Generate tags file for editors'
>  	@echo  '  cscope          - Generate cscope index'
>  	@echo  ''
> -	@$(if $(TARGET_DIRS), \
> +	@$(if $(TARGET_LIST), \
>  		echo 'Architecture specific targets:'; \
> -		$(foreach t, $(TARGET_DIRS), \
> +		$(foreach t, $(TARGET_LIST), \
>  		printf "  %-30s - Build for %s\\n" $(patsubst %,subdir-%,$(t)) $(t);) \
>  		echo '')
>  	@echo  'Cleaning targets:'
> diff --git a/configure b/configure
> index db8c9d8288..14b11130a7 100755
> --- a/configure
> +++ b/configure
> @@ -6128,7 +6128,7 @@ qemu_version=$(head $source_path/VERSION)
>  echo "VERSION=$qemu_version" >>$config_host_mak
>  echo "PKGVERSION=$pkgversion" >>$config_host_mak
>  echo "SRC_PATH=$source_path" >> $config_host_mak
> -echo "TARGET_DIRS=$target_list" >> $config_host_mak
> +echo "TARGET_LIST=$target_list" >> $config_host_mak
>  if [ "$docs" = "yes" ] ; then
>    echo "BUILD_DOCS=yes" >> $config_host_mak
>  fi
> diff --git a/scripts/create_config b/scripts/create_config
> index d727e5e36e..58948a67a4 100755
> --- a/scripts/create_config
> +++ b/scripts/create_config
> @@ -107,7 +107,7 @@ case $line in
>      target_name=${line#*=}
>      echo "#define TARGET_NAME \"$target_name\""
>      ;;
> - TARGET_DIRS=*)
> + TARGET_LIST=*)
>      # do nothing
>      ;;
>   TARGET_*=y) # configuration
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index 86f90c0cb0..9854e7794b 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -858,7 +858,7 @@ endif
>  
>  # QTest rules
>  
> -TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_DIRS)))
> +TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_LIST)))
>  ifeq ($(CONFIG_POSIX),y)
>  QTEST_TARGETS = $(TARGETS)
>  check-qtest-y=$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET)-y))
>
Re: [Qemu-devel] [PULL 3/6] Makefile: Rename TARGET_DIRS to TARGET_LIST
Posted by Alex Bennée 7 years, 7 months ago 
Paolo Bonzini <pbonzini@redhat.com> writes:

> On 05/06/2018 18:05, Alex Bennée wrote:
>> From: Fam Zheng <famz@redhat.com>
>>
>> To be more accurate on its purpose and make code that looks for a certain
>> target out of this variable more readable.
>
> This breaks the Docker mingw build, because the full list of targets
> used on the host is passed to the container.  This includes linux-user
> targets which do not exist on non-Linux.

Ahh I hadn't noticed because we are not building the fill set on
shippable:

  https://app.shippable.com/github/qemu/qemu/runs/1046/2/console

>
> Paolo
>
>> Signed-off-by: Fam Zheng <famz@redhat.com>
>> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>> Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>>
>> diff --git a/Makefile b/Makefile
>> index 6d588d1f71..023b3437ec 100644
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -62,8 +62,8 @@ seems to have been used for an in-tree build. You can fix this by running \
>>  endif
>>  endif
>>
>> -CONFIG_SOFTMMU := $(if $(filter %-softmmu,$(TARGET_DIRS)),y)
>> -CONFIG_USER_ONLY := $(if $(filter %-user,$(TARGET_DIRS)),y)
>> +CONFIG_SOFTMMU := $(if $(filter %-softmmu,$(TARGET_LIST)),y)
>> +CONFIG_USER_ONLY := $(if $(filter %-user,$(TARGET_LIST)),y)
>>  CONFIG_XEN := $(CONFIG_XEN_BACKEND)
>>  CONFIG_ALL=y
>>  -include config-all-devices.mak
>> @@ -366,8 +366,8 @@ DOCS=
>>  endif
>>
>>  SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory --quiet) BUILD_DIR=$(BUILD_DIR)
>> -SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_DIRS))
>> -SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %-config-devices.mak.d, $(TARGET_DIRS))
>> +SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_LIST))
>> +SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %-config-devices.mak.d, $(TARGET_LIST))
>>
>>  ifeq ($(SUBDIR_DEVICES_MAK),)
>>  config-all-devices.mak:
>> @@ -470,7 +470,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","$@")
>>
>> -SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS))
>> +SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_LIST))
>>  SOFTMMU_SUBDIR_RULES=$(filter %-softmmu,$(SUBDIR_RULES))
>>
>>  $(SOFTMMU_SUBDIR_RULES): $(block-obj-y)
>> @@ -514,7 +514,7 @@ ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS))
>>  romsubdir-%:
>>  	$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C pc-bios/$* V="$(V)" TARGET_DIR="$*/" CFLAGS="$(filter -O% -g%,$(CFLAGS))",)
>>
>> -ALL_SUBDIRS=$(TARGET_DIRS) $(patsubst %,pc-bios/%, $(ROMS))
>> +ALL_SUBDIRS=$(TARGET_LIST) $(patsubst %,pc-bios/%, $(ROMS))
>>
>>  recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES)
>>
>> @@ -772,7 +772,7 @@ distclean: clean
>>  	rm -f docs/interop/qemu-qmp-ref.pdf docs/interop/qemu-ga-ref.pdf
>>  	rm -f docs/interop/qemu-qmp-ref.html docs/interop/qemu-ga-ref.html
>>  	rm -f docs/qemu-block-drivers.7
>> -	for d in $(TARGET_DIRS); do \
>> +	for d in $(TARGET_LIST); do \
>>  	rm -rf $$d || exit 1 ; \
>>          done
>>  	rm -Rf .sdk
>> @@ -873,7 +873,7 @@ endif
>>  		$(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadir)/keymaps"; \
>>  	done
>>  	$(INSTALL_DATA) $(BUILD_DIR)/trace-events-all "$(DESTDIR)$(qemu_datadir)/trace-events-all"
>> -	for d in $(TARGET_DIRS); do \
>> +	for d in $(TARGET_LIST); do \
>>  	$(MAKE) $(SUBDIR_MAKEFLAGS) TARGET_DIR=$$d/ -C $$d $@ || exit 1 ; \
>>          done
>>
>> @@ -1071,9 +1071,9 @@ endif
>>  	@echo  '  ctags/TAGS      - Generate tags file for editors'
>>  	@echo  '  cscope          - Generate cscope index'
>>  	@echo  ''
>> -	@$(if $(TARGET_DIRS), \
>> +	@$(if $(TARGET_LIST), \
>>  		echo 'Architecture specific targets:'; \
>> -		$(foreach t, $(TARGET_DIRS), \
>> +		$(foreach t, $(TARGET_LIST), \
>>  		printf "  %-30s - Build for %s\\n" $(patsubst %,subdir-%,$(t)) $(t);) \
>>  		echo '')
>>  	@echo  'Cleaning targets:'
>> diff --git a/configure b/configure
>> index db8c9d8288..14b11130a7 100755
>> --- a/configure
>> +++ b/configure
>> @@ -6128,7 +6128,7 @@ qemu_version=$(head $source_path/VERSION)
>>  echo "VERSION=$qemu_version" >>$config_host_mak
>>  echo "PKGVERSION=$pkgversion" >>$config_host_mak
>>  echo "SRC_PATH=$source_path" >> $config_host_mak
>> -echo "TARGET_DIRS=$target_list" >> $config_host_mak
>> +echo "TARGET_LIST=$target_list" >> $config_host_mak
>>  if [ "$docs" = "yes" ] ; then
>>    echo "BUILD_DOCS=yes" >> $config_host_mak
>>  fi
>> diff --git a/scripts/create_config b/scripts/create_config
>> index d727e5e36e..58948a67a4 100755
>> --- a/scripts/create_config
>> +++ b/scripts/create_config
>> @@ -107,7 +107,7 @@ case $line in
>>      target_name=${line#*=}
>>      echo "#define TARGET_NAME \"$target_name\""
>>      ;;
>> - TARGET_DIRS=*)
>> + TARGET_LIST=*)
>>      # do nothing
>>      ;;
>>   TARGET_*=y) # configuration
>> diff --git a/tests/Makefile.include b/tests/Makefile.include
>> index 86f90c0cb0..9854e7794b 100644
>> --- a/tests/Makefile.include
>> +++ b/tests/Makefile.include
>> @@ -858,7 +858,7 @@ endif
>>
>>  # QTest rules
>>
>> -TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_DIRS)))
>> +TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_LIST)))
>>  ifeq ($(CONFIG_POSIX),y)
>>  QTEST_TARGETS = $(TARGETS)
>>  check-qtest-y=$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET)-y))
>>


--
Alex Bennée
Re: [Qemu-devel] [PULL 3/6] Makefile: Rename TARGET_DIRS to TARGET_LIST
Posted by Alex Bennée 7 years, 7 months ago 
Paolo Bonzini <pbonzini@redhat.com> writes:

> On 05/06/2018 18:05, Alex Bennée wrote:
>> From: Fam Zheng <famz@redhat.com>
>>
>> To be more accurate on its purpose and make code that looks for a certain
>> target out of this variable more readable.
>
> This breaks the Docker mingw build, because the full list of targets
> used on the host is passed to the container.  This includes linux-user
> targets which do not exist on non-Linux.

OK I have a fix which I'll include in my gcov and build fixes later
today.

>
> Paolo
>
>> Signed-off-by: Fam Zheng <famz@redhat.com>
>> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>> Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>>
>> diff --git a/Makefile b/Makefile
>> index 6d588d1f71..023b3437ec 100644
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -62,8 +62,8 @@ seems to have been used for an in-tree build. You can fix this by running \
>>  endif
>>  endif
>>
>> -CONFIG_SOFTMMU := $(if $(filter %-softmmu,$(TARGET_DIRS)),y)
>> -CONFIG_USER_ONLY := $(if $(filter %-user,$(TARGET_DIRS)),y)
>> +CONFIG_SOFTMMU := $(if $(filter %-softmmu,$(TARGET_LIST)),y)
>> +CONFIG_USER_ONLY := $(if $(filter %-user,$(TARGET_LIST)),y)
>>  CONFIG_XEN := $(CONFIG_XEN_BACKEND)
>>  CONFIG_ALL=y
>>  -include config-all-devices.mak
>> @@ -366,8 +366,8 @@ DOCS=
>>  endif
>>
>>  SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory --quiet) BUILD_DIR=$(BUILD_DIR)
>> -SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_DIRS))
>> -SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %-config-devices.mak.d, $(TARGET_DIRS))
>> +SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_LIST))
>> +SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %-config-devices.mak.d, $(TARGET_LIST))
>>
>>  ifeq ($(SUBDIR_DEVICES_MAK),)
>>  config-all-devices.mak:
>> @@ -470,7 +470,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","$@")
>>
>> -SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS))
>> +SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_LIST))
>>  SOFTMMU_SUBDIR_RULES=$(filter %-softmmu,$(SUBDIR_RULES))
>>
>>  $(SOFTMMU_SUBDIR_RULES): $(block-obj-y)
>> @@ -514,7 +514,7 @@ ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS))
>>  romsubdir-%:
>>  	$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C pc-bios/$* V="$(V)" TARGET_DIR="$*/" CFLAGS="$(filter -O% -g%,$(CFLAGS))",)
>>
>> -ALL_SUBDIRS=$(TARGET_DIRS) $(patsubst %,pc-bios/%, $(ROMS))
>> +ALL_SUBDIRS=$(TARGET_LIST) $(patsubst %,pc-bios/%, $(ROMS))
>>
>>  recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES)
>>
>> @@ -772,7 +772,7 @@ distclean: clean
>>  	rm -f docs/interop/qemu-qmp-ref.pdf docs/interop/qemu-ga-ref.pdf
>>  	rm -f docs/interop/qemu-qmp-ref.html docs/interop/qemu-ga-ref.html
>>  	rm -f docs/qemu-block-drivers.7
>> -	for d in $(TARGET_DIRS); do \
>> +	for d in $(TARGET_LIST); do \
>>  	rm -rf $$d || exit 1 ; \
>>          done
>>  	rm -Rf .sdk
>> @@ -873,7 +873,7 @@ endif
>>  		$(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadir)/keymaps"; \
>>  	done
>>  	$(INSTALL_DATA) $(BUILD_DIR)/trace-events-all "$(DESTDIR)$(qemu_datadir)/trace-events-all"
>> -	for d in $(TARGET_DIRS); do \
>> +	for d in $(TARGET_LIST); do \
>>  	$(MAKE) $(SUBDIR_MAKEFLAGS) TARGET_DIR=$$d/ -C $$d $@ || exit 1 ; \
>>          done
>>
>> @@ -1071,9 +1071,9 @@ endif
>>  	@echo  '  ctags/TAGS      - Generate tags file for editors'
>>  	@echo  '  cscope          - Generate cscope index'
>>  	@echo  ''
>> -	@$(if $(TARGET_DIRS), \
>> +	@$(if $(TARGET_LIST), \
>>  		echo 'Architecture specific targets:'; \
>> -		$(foreach t, $(TARGET_DIRS), \
>> +		$(foreach t, $(TARGET_LIST), \
>>  		printf "  %-30s - Build for %s\\n" $(patsubst %,subdir-%,$(t)) $(t);) \
>>  		echo '')
>>  	@echo  'Cleaning targets:'
>> diff --git a/configure b/configure
>> index db8c9d8288..14b11130a7 100755
>> --- a/configure
>> +++ b/configure
>> @@ -6128,7 +6128,7 @@ qemu_version=$(head $source_path/VERSION)
>>  echo "VERSION=$qemu_version" >>$config_host_mak
>>  echo "PKGVERSION=$pkgversion" >>$config_host_mak
>>  echo "SRC_PATH=$source_path" >> $config_host_mak
>> -echo "TARGET_DIRS=$target_list" >> $config_host_mak
>> +echo "TARGET_LIST=$target_list" >> $config_host_mak
>>  if [ "$docs" = "yes" ] ; then
>>    echo "BUILD_DOCS=yes" >> $config_host_mak
>>  fi
>> diff --git a/scripts/create_config b/scripts/create_config
>> index d727e5e36e..58948a67a4 100755
>> --- a/scripts/create_config
>> +++ b/scripts/create_config
>> @@ -107,7 +107,7 @@ case $line in
>>      target_name=${line#*=}
>>      echo "#define TARGET_NAME \"$target_name\""
>>      ;;
>> - TARGET_DIRS=*)
>> + TARGET_LIST=*)
>>      # do nothing
>>      ;;
>>   TARGET_*=y) # configuration
>> diff --git a/tests/Makefile.include b/tests/Makefile.include
>> index 86f90c0cb0..9854e7794b 100644
>> --- a/tests/Makefile.include
>> +++ b/tests/Makefile.include
>> @@ -858,7 +858,7 @@ endif
>>
>>  # QTest rules
>>
>> -TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_DIRS)))
>> +TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_LIST)))
>>  ifeq ($(CONFIG_POSIX),y)
>>  QTEST_TARGETS = $(TARGETS)
>>  check-qtest-y=$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET)-y))
>>


--
Alex Bennée

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.