[Qemu-devel] [PULL 0/6] Some docker updates

[Qemu-devel] [PULL 0/6] Some docker updates

[Alex Bennée]

The following changes since commit 1d889f2a8baaa265939b339d2f52ec57f5b8a09c:

  Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging (2018-06-05 15:22:07 +0100)

are available in the Git repository at:

  https://github.com/stsquad/qemu.git tags/pull-docker-updates-050618-1

for you to fetch changes up to 36dc5fedab0339afdeb3c40ff820c7e5ce334751:

  docker: add debian/tricore image (2018-06-05 16:25:43 +0100)

----------------------------------------------------------------
Docker related updates

  - configure/probe for docker
  - TARGET_DIRS -> TARGET_LIST cleanup
  - new fedora-i386-cross and debian/tricore images
  - test-mingw use SDL2/GTK3

----------------------------------------------------------------
Alex Bennée (2):
      docker: add "probe" command for configure
      configure: add test for docker availability

Fam Zheng (2):
      Makefile: Rename TARGET_DIRS to TARGET_LIST
      docker: Add fedora-i386-cross image

Paolo Bonzini (1):
      docker: test-mingw: use SDL2 and GTK+3

Philippe Mathieu-Daudé (1):
      docker: add debian/tricore image

 Makefile                                           | 20 +++++++++----------
 configure                                          | 19 +++++++++++++++++-
 scripts/create_config                              |  2 +-
 tests/Makefile.include                             |  2 +-
 tests/docker/Makefile.include                      |  3 +++
 tests/docker/docker.py                             | 18 +++++++++++++++++
 .../docker/dockerfiles/debian-tricore-cross.docker | 23 ++++++++++++++++++++++
 tests/docker/dockerfiles/fedora-i386-cross.docker  | 14 +++++++++++++
 tests/docker/dockerfiles/fedora.docker             |  8 ++++----
 tests/docker/test-mingw                            |  4 ++--
 10 files changed, 94 insertions(+), 19 deletions(-)
 create mode 100644 tests/docker/dockerfiles/debian-tricore-cross.docker
 create mode 100644 tests/docker/dockerfiles/fedora-i386-cross.docker


-- 
2.17.0

[Qemu-devel] [PULL 1/6] docker: add "probe" command for configure

[Alex Bennée]

This is a helper function for the configure script. It replies yes,
sudo or no to inform the user if non-interactive docker support is
available. We trap the Exception to fail gracefully.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Fam Zheng <famz@redhat.com>

diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index 1246ba9578..f8267586eb 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -390,6 +390,24 @@ class ImagesCommand(SubCommand):
     def run(self, args, argv):
         return Docker().command("images", argv, args.quiet)
 
+
+class ProbeCommand(SubCommand):
+    """Probe if we can run docker automatically"""
+    name = "probe"
+
+    def run(self, args, argv):
+        try:
+            docker = Docker()
+            if docker._command[0] == "docker":
+                print "yes"
+            elif docker._command[0] == "sudo":
+                print "sudo"
+        except Exception:
+            print "no"
+
+        return
+
+
 def main():
     parser = argparse.ArgumentParser(description="A Docker helper",
             usage="%s <subcommand> ..." % os.path.basename(sys.argv[0]))
-- 
2.17.0

[Qemu-devel] [PULL 2/6] configure: add test for docker availability

[Alex Bennée]

This tests for a working docker installation without sudo and sets up
config-host.mak accordingly. This will be useful from cross compiling
things in the future.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

diff --git a/configure b/configure
index ab810d728f..db8c9d8288 100755
--- a/configure
+++ b/configure
@@ -456,6 +456,7 @@ jemalloc="no"
 replication="yes"
 vxhs=""
 libxml2=""
+docker="no"
 
 supported_cpu="no"
 supported_os="no"
@@ -5450,6 +5451,17 @@ EOF
   fi
 fi
 
+##########################################
+# Docker and cross-compiler support
+#
+# This is specifically for building test
+# cases for foreign architectures, not
+# cross-compiling QEMU itself.
+
+if has "docker"; then
+    docker=$($python $source_path/tests/docker/docker.py probe)
+fi
+
 ##########################################
 # End of CC checks
 # After here, no more $cc or $ld runs
@@ -5913,6 +5925,7 @@ echo "avx2 optimization $avx2_opt"
 echo "replication support $replication"
 echo "VxHS block device $vxhs"
 echo "capstone          $capstone"
+echo "docker            $docker"
 
 if test "$sdl_too_old" = "yes"; then
 echo "-> Your SDL version is too old - please upgrade to have SDL support"
@@ -6740,6 +6753,10 @@ if test "$gcov" = "yes" ; then
   echo "GCOV=$gcov_tool" >> $config_host_mak
 fi
 
+if test "$docker" != "no"; then
+    echo "HAVE_USER_DOCKER=y" >> $config_host_mak
+fi
+
 # use included Linux headers
 if test "$linux" = "yes" ; then
   mkdir -p linux-headers
-- 
2.17.0

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

[Alex Bennée]

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

[Qemu-devel] [PULL 4/6] docker: Add fedora-i386-cross image

[Alex Bennée]

From: Fam Zheng <famz@redhat.com>

It has some basic *-devel.i686 packages to be used with "gcc -m32" as a
32 bit cross build environment.

Signed-off-by: Fam Zheng <famz@redhat.com>
[AJB: add glibc-static]
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

diff --git a/tests/docker/dockerfiles/fedora-i386-cross.docker b/tests/docker/dockerfiles/fedora-i386-cross.docker
new file mode 100644
index 0000000000..8fbef2fa53
--- /dev/null
+++ b/tests/docker/dockerfiles/fedora-i386-cross.docker
@@ -0,0 +1,14 @@
+FROM fedora:latest
+ENV PACKAGES \
+    gcc \
+    glibc-static.i686 \
+    glibc-devel.i686 \
+    glib2-devel.i686 \
+    zlib-devel.i686 \
+    glib2-devel.i686 \
+    nettle-devel.i686 \
+    pixman-devel.i686 \
+    gnutls-devel.i686
+
+RUN dnf install -y $PACKAGES
+RUN rpm -q $PACKAGES | sort > /packages.txt
-- 
2.17.0

[Qemu-devel] [PULL 5/6] docker: test-mingw: use SDL2 and GTK+3

[Alex Bennée]

From: Paolo Bonzini <pbonzini@redhat.com>

Do not test the deprecated API versions.  debian-win32-cross and debian-win64-cross
are already using SDL2 (they do not cover GTK+ at all).

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
[AJB: fix merge conflicts]
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
index 65d7761cf5..7d1d008002 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -11,12 +11,12 @@ ENV PACKAGES \
     numactl-devel SDL2-devel snappy-devel spice-server-devel \
     systemtap-sdt-devel usbredir-devel virglrenderer-devel vte3-devel \
     xen-devel \
-    mingw32-pixman mingw32-glib2 mingw32-gmp mingw32-SDL mingw32-pkg-config \
-    mingw32-gtk2 mingw32-gtk3 mingw32-gnutls mingw32-nettle mingw32-libtasn1 \
+    mingw32-pixman mingw32-glib2 mingw32-gmp mingw32-SDL2 mingw32-pkg-config \
+    mingw32-gtk3 mingw32-gnutls mingw32-nettle mingw32-libtasn1 \
     mingw32-libjpeg-turbo mingw32-libpng mingw32-curl mingw32-libssh2 \
     mingw32-bzip2 \
-    mingw64-pixman mingw64-glib2 mingw64-gmp mingw64-SDL mingw64-pkg-config \
-    mingw64-gtk2 mingw64-gtk3 mingw64-gnutls mingw64-nettle mingw64-libtasn1 \
+    mingw64-pixman mingw64-glib2 mingw64-gmp mingw64-SDL2 mingw64-pkg-config \
+    mingw64-gtk3 mingw64-gnutls mingw64-nettle mingw64-libtasn1 \
     mingw64-libjpeg-turbo mingw64-libpng mingw64-curl mingw64-libssh2 \
     mingw64-bzip2
 ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3
diff --git a/tests/docker/test-mingw b/tests/docker/test-mingw
index 503a6bc6f7..7cca7e16a6 100755
--- a/tests/docker/test-mingw
+++ b/tests/docker/test-mingw
@@ -28,8 +28,8 @@ for prefix in x86_64-w64-mingw32- i686-w64-mingw32-; do
         --enable-vnc \
         --enable-bzip2 \
         --enable-guest-agent \
-        --with-sdlabi=1.2 \
-        --with-gtkabi=2.0
+        --with-sdlabi=2.0 \
+        --with-gtkabi=3.0
     install_qemu
     make clean
 
-- 
2.17.0

[Qemu-devel] [PULL 6/6] docker: add debian/tricore image

[Alex Bennée]

From: Philippe Mathieu-Daudé <f4bug@amsat.org>

TriCore binutils is built from Bastian Koppelmann repository.

Note: There is no TriCore compiler in this image (only assembler/linker).

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
[AJB: base of Debian9, add to Makefile.include]
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 9d5749887a..74fd51c22c 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -63,6 +63,9 @@ docker-image-debian-win32-cross: docker-image-debian8-mxe
 docker-image-debian-win64-cross: docker-image-debian8-mxe
 docker-image-travis: NOUSER=1
 
+# Specialist build images, sometimes very limited tools
+docker-image-tricore-cross: docker-image-debian9
+
 # Expand all the pre-requistes for each docker image and test combination
 $(foreach i,$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES), \
 	$(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \
diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/docker/dockerfiles/debian-tricore-cross.docker
new file mode 100644
index 0000000000..898b8dd511
--- /dev/null
+++ b/tests/docker/dockerfiles/debian-tricore-cross.docker
@@ -0,0 +1,23 @@
+#
+# Docker TriCore cross-compiler target
+#
+# This docker target builds on the debian Stretch base image.
+#
+# Copyright (c) 2018 Philippe Mathieu-Daudé
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+FROM debian:9
+
+MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>
+
+RUN git clone --single-branch \
+        https://github.com/bkoppelmann/tricore-binutils.git \
+        /usr/src/binutils && \
+    cd /usr/src/binutils && chmod +x missing && \
+    CFLAGS=-w ./configure --prefix=/usr --disable-nls --target=tricore && \
+    make && make install && \
+    rm -rf /usr/src/binutils
+
+# Specify the cross prefix for this image (see tests/docker/common.rc)
+ENV QEMU_CONFIGURE_OPTS --cross-prefix=tricore-
-- 
2.17.0

Re: [Qemu-devel] [PULL 0/6] Some docker updates

[Peter Maydell]

On 5 June 2018 at 17:05, Alex Bennée <alex.bennee@linaro.org> wrote:
> The following changes since commit 1d889f2a8baaa265939b339d2f52ec57f5b8a09c:
>
>   Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging (2018-06-05 15:22:07 +0100)
>
> are available in the Git repository at:
>
>   https://github.com/stsquad/qemu.git tags/pull-docker-updates-050618-1
>
> for you to fetch changes up to 36dc5fedab0339afdeb3c40ff820c7e5ce334751:
>
>   docker: add debian/tricore image (2018-06-05 16:25:43 +0100)
>
> ----------------------------------------------------------------
> Docker related updates
>
>   - configure/probe for docker
>   - TARGET_DIRS -> TARGET_LIST cleanup
>   - new fedora-i386-cross and debian/tricore images
>   - test-mingw use SDL2/GTK3
>
> ----------------------------------------------------------------
Applied, thanks.

-- PMM

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

[Paolo Bonzini]

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

[Alex Bennée]

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

[Alex Bennée]

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