[Qemu-devel] [PULL 00/10] configury queue

[Qemu-devel] [PULL 00/10] configury queue

[Peter Maydell]

Hi; this is a pullrequest for a set of patches to the configure
machinery:
 * Paolo's cleanups of TARGET_ARCH/TARGET_NAME
 * Peter C's fix for the configure fdt probe against new libfdt
 * my series making libfdt mandatory on arm/ppc/microblaze

The patches have all been on the list and reviewed; this is
just gathering them up in the right order for convenience

(I fixed up a trivial post-rebase conflict in the 'rename
TARGET_ARCH2' patch; and I added some (harmlessly) missing
hyphens in my 'configure: Require libfdt' patch.)

Please pull.

[NB: I don't know if we get enough build-machinery patches to make
it worth having a permanent subtree/submaintainer for them; it's
merely that at the moment there are enough patches I personally
care about that I felt like curating them ;-)]

thanks
-- PMM

The following changes since commit 301255e6303457e10b9a42dc208f80c058004c1c:

  Merge remote-tracking branch 'mjt/trivial-patches-next' into staging (2013-06-14 07:51:45 -0500)

are available in the git repository at:


  git://git.linaro.org/people/pmaydell/qemu-arm.git configury.next

for you to fetch changes up to 187f1bcb9ce8e3cd3f634dd5405f9e5ed02b38ce:

  ppc: Remove CONFIG_FDT conditionals (2013-06-14 15:34:19 +0100)

----------------------------------------------------------------
Alon Levy (1):
      Add a stp file for usage from build directory

Paolo Bonzini (4):
      build: rename TARGET_ARCH2 to TARGET_NAME
      build: do not use TARGET_ARCH
      main: use TARGET_ARCH only for the target-specific #define
      build: drop TARGET_TYPE

Peter Crosthwaite (1):
      configure: dtc: Probe for libfdt_env.h

Peter Maydell (4):
      configure: Require libfdt for arm, ppc, microblaze softmmu targets
      arm: Remove CONFIG_FDT conditionals
      microblaze: Remove CONFIG_FDT conditionals
      ppc: Remove CONFIG_FDT conditionals

 Makefile.target                    |   28 +++++++++++------
 arch_init.c                        |    4 +--
 bsd-user/main.c                    |    6 ++--
 configure                          |   60 ++++++++++++++++++++++++------------
 default-configs/ppc-softmmu.mak    |    2 +-
 default-configs/ppc64-softmmu.mak  |    4 +--
 default-configs/ppcemb-softmmu.mak |    2 +-
 docs/tracing.txt                   |    2 +-
 hw/arm/boot.c                      |    7 -----
 hw/microblaze/boot.c               |   12 --------
 hw/ppc/ppc440_bamboo.c             |    2 --
 hw/ppc/spapr_vio.c                 |    6 ----
 hw/ppc/virtex_ml507.c              |   18 -----------
 include/libfdt_env.h               |   36 ----------------------
 linux-user/main.c                  |    6 ++--
 qapi-schema.json                   |   18 +----------
 scripts/create_config              |   15 +++------
 scripts/tracetool.py               |   18 +++++------
 18 files changed, 87 insertions(+), 159 deletions(-)
 delete mode 100644 include/libfdt_env.h

[Qemu-devel] [PULL 01/10] Add a stp file for usage from build directory

[Peter Maydell]

From: Alon Levy <alevy@redhat.com>

For systemtap the location of the process being tapped is crucial, as a
result the existing stp file requires installation for use.

There are now two files:
$(TARGET_DIR)/$(QEMU_PROG).stp-installed: copied to $(tapdir)/$(QEMU_PROG).stp
$(TARGET_DIR)/$(QEMU_PROG).stp: pointing to the built binary, usable
                                without installation

To use:
stap -I $(TARGET_DIR) ...

Signed-off-by: Alon Levy <alevy@redhat.com>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1370349928-20419-2-git-send-email-pbonzini@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 Makefile.target |   16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/Makefile.target b/Makefile.target
index b0be124..2903897 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -35,7 +35,7 @@ config-target.h: config-target.h-timestamp
 config-target.h-timestamp: config-target.mak
 
 ifdef CONFIG_TRACE_SYSTEMTAP
-stap: $(QEMU_PROG).stp
+stap: $(QEMU_PROG).stp-installed $(QEMU_PROG).stp
 
 ifdef CONFIG_USER_ONLY
 TARGET_TYPE=user
@@ -43,14 +43,24 @@ else
 TARGET_TYPE=system
 endif
 
-$(QEMU_PROG).stp: $(SRC_PATH)/trace-events
+$(QEMU_PROG).stp-installed: $(SRC_PATH)/trace-events
 	$(call quiet-command,$(TRACETOOL) \
 		--format=stap \
 		--backend=$(TRACE_BACKEND) \
 		--binary=$(bindir)/$(QEMU_PROG) \
 		--target-arch=$(TARGET_ARCH) \
 		--target-type=$(TARGET_TYPE) \
+		< $< > $@,"  GEN   $(TARGET_DIR)$(QEMU_PROG).stp-installed")
+
+$(QEMU_PROG).stp: $(SRC_PATH)/trace-events
+	$(call quiet-command,$(TRACETOOL) \
+		--format=stap \
+		--backend=$(TRACE_BACKEND) \
+		--binary=$(realpath .)/$(QEMU_PROG) \
+		--target-arch=$(TARGET_ARCH) \
+		--target-type=$(TARGET_TYPE) \
 		< $< > $@,"  GEN   $(TARGET_DIR)$(QEMU_PROG).stp")
+
 else
 stap:
 endif
@@ -182,7 +192,7 @@ endif
 endif
 ifdef CONFIG_TRACE_SYSTEMTAP
 	$(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset"
-	$(INSTALL_DATA) $(QEMU_PROG).stp "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset"
+	$(INSTALL_DATA) $(QEMU_PROG).stp-installed "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset/$(QEMU_PROG).stp"
 endif
 
 GENERATED_HEADERS += config-target.h
-- 
1.7.9.5

[Qemu-devel] [PULL 02/10] build: rename TARGET_ARCH2 to TARGET_NAME

[Peter Maydell]

From: Paolo Bonzini <pbonzini@redhat.com>

Do not introduce any new use yet.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1370349928-20419-3-git-send-email-pbonzini@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 Makefile.target       |    6 +++---
 configure             |   38 +++++++++++++++++++-------------------
 scripts/create_config |    2 +-
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/Makefile.target b/Makefile.target
index 2903897..fcc880b 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -15,14 +15,14 @@ QEMU_CFLAGS+=-I$(SRC_PATH)/include
 
 ifdef CONFIG_USER_ONLY
 # user emulator name
-QEMU_PROG=qemu-$(TARGET_ARCH2)
+QEMU_PROG=qemu-$(TARGET_NAME)
 else
 # system emulator name
 ifneq (,$(findstring -mwindows,$(libs_softmmu)))
 # Terminate program name with a 'w' because the linker builds a windows executable.
-QEMU_PROGW=qemu-system-$(TARGET_ARCH2)w$(EXESUF)
+QEMU_PROGW=qemu-system-$(TARGET_NAME)w$(EXESUF)
 endif # windows executable
-QEMU_PROG=qemu-system-$(TARGET_ARCH2)$(EXESUF)
+QEMU_PROG=qemu-system-$(TARGET_NAME)$(EXESUF)
 endif
 
 PROGS=$(QEMU_PROG)
diff --git a/configure b/configure
index 60b0811..1dfa712 100755
--- a/configure
+++ b/configure
@@ -4083,10 +4083,10 @@ fi
 for target in $target_list; do
 target_dir="$target"
 config_target_mak=$target_dir/config-target.mak
-target_arch2=`echo $target | cut -d '-' -f 1`
+target_name=`echo $target | cut -d '-' -f 1`
 target_bigendian="no"
 
-case "$target_arch2" in
+case "$target_name" in
   armeb|lm32|m68k|microblaze|mips|mipsn32|mips64|moxie|or32|ppc|ppcemb|ppc64|ppc64abi32|s390x|sh4eb|sparc|sparc64|sparc32plus|xtensaeb)
   target_bigendian=yes
   ;;
@@ -4096,17 +4096,17 @@ target_user_only="no"
 target_linux_user="no"
 target_bsd_user="no"
 case "$target" in
-  ${target_arch2}-softmmu)
+  ${target_name}-softmmu)
     target_softmmu="yes"
     ;;
-  ${target_arch2}-linux-user)
+  ${target_name}-linux-user)
     if test "$linux" != "yes" ; then
       error_exit "Target '$target' is only available on a Linux host"
     fi
     target_user_only="yes"
     target_linux_user="yes"
     ;;
-  ${target_arch2}-bsd-user)
+  ${target_name}-bsd-user)
     if test "$bsd" != "yes" ; then
       error_exit "Target '$target' is only available on a BSD host"
     fi
@@ -4124,14 +4124,14 @@ echo "# Automatically generated by configure - do not modify" > $config_target_m
 
 bflt="no"
 target_nptl="no"
-interp_prefix1=`echo "$interp_prefix" | sed "s/%M/$target_arch2/g"`
+interp_prefix1=`echo "$interp_prefix" | sed "s/%M/$target_name/g"`
 gdb_xml_files=""
 
-TARGET_ARCH="$target_arch2"
+TARGET_ARCH="$target_name"
 TARGET_BASE_ARCH=""
 TARGET_ABI_DIR=""
 
-case "$target_arch2" in
+case "$target_name" in
   i386)
   ;;
   x86_64)
@@ -4246,14 +4246,14 @@ upper() {
 echo "TARGET_ARCH=$TARGET_ARCH" >> $config_target_mak
 target_arch_name="`upper $TARGET_ARCH`"
 echo "TARGET_$target_arch_name=y" >> $config_target_mak
-echo "TARGET_ARCH2=$target_arch2" >> $config_target_mak
-echo "TARGET_TYPE=TARGET_TYPE_`upper $target_arch2`" >> $config_target_mak
+echo "TARGET_NAME=$target_name" >> $config_target_mak
+echo "TARGET_TYPE=TARGET_TYPE_`upper $target_name`" >> $config_target_mak
 echo "TARGET_BASE_ARCH=$TARGET_BASE_ARCH" >> $config_target_mak
 if [ "$TARGET_ABI_DIR" = "" ]; then
   TARGET_ABI_DIR=$TARGET_ARCH
 fi
 echo "TARGET_ABI_DIR=$TARGET_ABI_DIR" >> $config_target_mak
-case "$target_arch2" in
+case "$target_name" in
   i386|x86_64)
     if test "$xen" = "yes" -a "$target_softmmu" = "yes" ; then
       echo "CONFIG_XEN=y" >> $config_target_mak
@@ -4264,17 +4264,17 @@ case "$target_arch2" in
     ;;
   *)
 esac
-case "$target_arch2" in
+case "$target_name" in
   arm|i386|x86_64|ppcemb|ppc|ppc64|s390x)
     # Make sure the target and host cpus are compatible
     if test "$kvm" = "yes" -a "$target_softmmu" = "yes" -a \
-      \( "$target_arch2" = "$cpu" -o \
-      \( "$target_arch2" = "ppcemb" -a "$cpu" = "ppc" \) -o \
-      \( "$target_arch2" = "ppc64"  -a "$cpu" = "ppc" \) -o \
-      \( "$target_arch2" = "ppc"    -a "$cpu" = "ppc64" \) -o \
-      \( "$target_arch2" = "ppcemb" -a "$cpu" = "ppc64" \) -o \
-      \( "$target_arch2" = "x86_64" -a "$cpu" = "i386"   \) -o \
-      \( "$target_arch2" = "i386"   -a "$cpu" = "x86_64" \) \) ; then
+      \( "$target_name" = "$cpu" -o \
+      \( "$target_name" = "ppcemb" -a "$cpu" = "ppc" \) -o \
+      \( "$target_name" = "ppc64"  -a "$cpu" = "ppc" \) -o \
+      \( "$target_name" = "ppc"    -a "$cpu" = "ppc64" \) -o \
+      \( "$target_name" = "ppcemb" -a "$cpu" = "ppc64" \) -o \
+      \( "$target_name" = "x86_64" -a "$cpu" = "i386"   \) -o \
+      \( "$target_name" = "i386"   -a "$cpu" = "x86_64" \) \) ; then
       echo "CONFIG_KVM=y" >> $config_target_mak
       if test "$vhost_net" = "yes" ; then
         echo "CONFIG_VHOST_NET=y" >> $config_target_mak
diff --git a/scripts/create_config b/scripts/create_config
index 258513a..6461ef6 100755
--- a/scripts/create_config
+++ b/scripts/create_config
@@ -94,7 +94,7 @@ case $line in
  TARGET_ABI_DIR=*)
     # do nothing
     ;;
- TARGET_ARCH2=*)
+ TARGET_NAME=*)
     # do nothing
     ;;
  TARGET_DIRS=*)
-- 
1.7.9.5

[Qemu-devel] [PULL 03/10] build: do not use TARGET_ARCH

[Peter Maydell]

From: Paolo Bonzini <pbonzini@redhat.com>

TARGET_ARCH is generally wrong to use, there are better variables
provided in config-target.mak.  The right one is usually TARGET_NAME
(previously TARGET_ARCH2), but for bsd-user we can also use TARGET_ABI_DIR
for consistency with linux-user.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1370349928-20419-4-git-send-email-pbonzini@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 Makefile.target      |    8 ++++----
 docs/tracing.txt     |    2 +-
 scripts/tracetool.py |   18 +++++++++---------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Makefile.target b/Makefile.target
index fcc880b..9a49852 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -48,7 +48,7 @@ $(QEMU_PROG).stp-installed: $(SRC_PATH)/trace-events
 		--format=stap \
 		--backend=$(TRACE_BACKEND) \
 		--binary=$(bindir)/$(QEMU_PROG) \
-		--target-arch=$(TARGET_ARCH) \
+		--target-name=$(TARGET_NAME) \
 		--target-type=$(TARGET_TYPE) \
 		< $< > $@,"  GEN   $(TARGET_DIR)$(QEMU_PROG).stp-installed")
 
@@ -57,7 +57,7 @@ $(QEMU_PROG).stp: $(SRC_PATH)/trace-events
 		--format=stap \
 		--backend=$(TRACE_BACKEND) \
 		--binary=$(realpath .)/$(QEMU_PROG) \
-		--target-arch=$(TARGET_ARCH) \
+		--target-name=$(TARGET_NAME) \
 		--target-type=$(TARGET_TYPE) \
 		< $< > $@,"  GEN   $(TARGET_DIR)$(QEMU_PROG).stp")
 
@@ -103,7 +103,7 @@ endif #CONFIG_LINUX_USER
 
 ifdef CONFIG_BSD_USER
 
-QEMU_CFLAGS+=-I$(SRC_PATH)/bsd-user -I$(SRC_PATH)/bsd-user/$(TARGET_ARCH)
+QEMU_CFLAGS+=-I$(SRC_PATH)/bsd-user -I$(SRC_PATH)/bsd-user/$(TARGET_ABI_DIR)
 
 obj-y += bsd-user/
 obj-y += gdbstub.o user-exec.o
@@ -128,7 +128,7 @@ obj-$(CONFIG_XEN) += xen-all.o xen-mapcache.o
 obj-$(CONFIG_NO_XEN) += xen-stub.o
 
 # Hardware support
-ifeq ($(TARGET_ARCH), sparc64)
+ifeq ($(TARGET_NAME), sparc64)
 obj-y += hw/sparc64/
 else
 obj-y += hw/$(TARGET_BASE_ARCH)/
diff --git a/docs/tracing.txt b/docs/tracing.txt
index 60ff9c5..bfc261b 100644
--- a/docs/tracing.txt
+++ b/docs/tracing.txt
@@ -225,7 +225,7 @@ probes:
     scripts/tracetool --dtrace --stap \
                       --binary path/to/qemu-binary \
                       --target-type system \
-                      --target-arch x86_64 \
+                      --target-name x86_64 \
                       <trace-events >qemu.stp
 
 == Trace event properties ==
diff --git a/scripts/tracetool.py b/scripts/tracetool.py
index a79ec0f..5f4890f 100755
--- a/scripts/tracetool.py
+++ b/scripts/tracetool.py
@@ -46,9 +46,9 @@ Options:
     --check-backend          Check if the given backend is valid.
     --binary <path>          Full path to QEMU binary.
     --target-type <type>     QEMU emulator target type ('system' or 'user').
-    --target-arch <arch>     QEMU emulator target arch.
+    --target-name <name>     QEMU emulator target name.
     --probe-prefix <prefix>  Prefix for dtrace probe names
-                             (default: qemu-<target-type>-<target-arch>).\
+                             (default: qemu-<target-type>-<target-name>).\
 """ % {
             "script" : _SCRIPT,
             "backends" : backend_descr,
@@ -66,7 +66,7 @@ def main(args):
     _SCRIPT = args[0]
 
     long_opts  = [ "backend=", "format=", "help", "list-backends", "check-backend" ]
-    long_opts += [ "binary=", "target-type=", "target-arch=", "probe-prefix=" ]
+    long_opts += [ "binary=", "target-type=", "target-name=", "probe-prefix=" ]
 
     try:
         opts, args = getopt.getopt(args[1:], "", long_opts)
@@ -78,7 +78,7 @@ def main(args):
     arg_format = ""
     binary = None
     target_type = None
-    target_arch = None
+    target_name = None
     probe_prefix = None
     for opt, arg in opts:
         if opt == "--help":
@@ -100,8 +100,8 @@ def main(args):
             binary = arg
         elif opt == '--target-type':
             target_type = arg
-        elif opt == '--target-arch':
-            target_arch = arg
+        elif opt == '--target-name':
+            target_name = arg
         elif opt == '--probe-prefix':
             probe_prefix = arg
 
@@ -122,11 +122,11 @@ def main(args):
             error_opt("--binary is required for SystemTAP tapset generator")
         if probe_prefix is None and target_type is None:
             error_opt("--target-type is required for SystemTAP tapset generator")
-        if probe_prefix is None and target_arch is None:
-            error_opt("--target-arch is required for SystemTAP tapset generator")
+        if probe_prefix is None and target_name is None:
+            error_opt("--target-name is required for SystemTAP tapset generator")
 
         if probe_prefix is None:
-            probe_prefix = ".".join([ "qemu", target_type, target_arch ])
+            probe_prefix = ".".join([ "qemu", target_type, target_name ])
 
     try:
         tracetool.generate(sys.stdin, arg_format, arg_backend,
-- 
1.7.9.5

[Qemu-devel] [PULL 04/10] main: use TARGET_ARCH only for the target-specific #define

[Peter Maydell]

From: Paolo Bonzini <pbonzini@redhat.com>

Everything else needs to match the executable name, which is
TARGET_NAME.

Before:
    $ sh4eb-linux-user/qemu-sh4eb --help
    usage: qemu-sh4 [options] program [arguments...]
    Linux CPU emulator (compiled for sh4 emulation)

After:
    $ sh4eb-linux-user/qemu-sh4eb --help
    usage: qemu-sh4eb [options] program [arguments...]
    Linux CPU emulator (compiled for sh4eb emulation)

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1370349928-20419-5-git-send-email-pbonzini@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 arch_init.c           |    2 +-
 bsd-user/main.c       |    6 +++---
 configure             |    1 -
 linux-user/main.c     |    6 +++---
 scripts/create_config |   13 ++++---------
 5 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/arch_init.c b/arch_init.c
index 5d32ecf..23ca953 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -123,7 +123,7 @@ static struct defconfig_file {
     bool userconfig;
 } default_config_files[] = {
     { CONFIG_QEMU_CONFDIR "/qemu.conf",                   true },
-    { CONFIG_QEMU_CONFDIR "/target-" TARGET_ARCH ".conf", true },
+    { CONFIG_QEMU_CONFDIR "/target-" TARGET_NAME ".conf", true },
     { NULL }, /* end of list */
 };
 
diff --git a/bsd-user/main.c b/bsd-user/main.c
index 0da3ab9..572f13a 100644
--- a/bsd-user/main.c
+++ b/bsd-user/main.c
@@ -670,8 +670,8 @@ void cpu_loop(CPUSPARCState *env)
 
 static void usage(void)
 {
-    printf("qemu-" TARGET_ARCH " version " QEMU_VERSION ", Copyright (c) 2003-2008 Fabrice Bellard\n"
-           "usage: qemu-" TARGET_ARCH " [options] program [arguments...]\n"
+    printf("qemu-" TARGET_NAME " version " QEMU_VERSION ", Copyright (c) 2003-2008 Fabrice Bellard\n"
+           "usage: qemu-" TARGET_NAME " [options] program [arguments...]\n"
            "BSD CPU emulator (compiled for %s emulation)\n"
            "\n"
            "Standard options:\n"
@@ -706,7 +706,7 @@ static void usage(void)
            "Note that if you provide several changes to single variable\n"
            "last change will stay in effect.\n"
            ,
-           TARGET_ARCH,
+           TARGET_NAME,
            interp_prefix,
            x86_stack_size);
     exit(1);
diff --git a/configure b/configure
index 1dfa712..46a2173 100755
--- a/configure
+++ b/configure
@@ -4243,7 +4243,6 @@ upper() {
     echo "$@"| LC_ALL=C tr '[a-z]' '[A-Z]'
 }
 
-echo "TARGET_ARCH=$TARGET_ARCH" >> $config_target_mak
 target_arch_name="`upper $TARGET_ARCH`"
 echo "TARGET_$target_arch_name=y" >> $config_target_mak
 echo "TARGET_NAME=$target_name" >> $config_target_mak
diff --git a/linux-user/main.c b/linux-user/main.c
index b97b8cf..21725a4 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -3339,7 +3339,7 @@ static void handle_arg_strace(const char *arg)
 
 static void handle_arg_version(const char *arg)
 {
-    printf("qemu-" TARGET_ARCH " version " QEMU_VERSION QEMU_PKGVERSION
+    printf("qemu-" TARGET_NAME " version " QEMU_VERSION QEMU_PKGVERSION
            ", Copyright (c) 2003-2008 Fabrice Bellard\n");
     exit(0);
 }
@@ -3400,8 +3400,8 @@ static void usage(void)
     int maxarglen;
     int maxenvlen;
 
-    printf("usage: qemu-" TARGET_ARCH " [options] program [arguments...]\n"
-           "Linux CPU emulator (compiled for " TARGET_ARCH " emulation)\n"
+    printf("usage: qemu-" TARGET_NAME " [options] program [arguments...]\n"
+           "Linux CPU emulator (compiled for " TARGET_NAME " emulation)\n"
            "\n"
            "Options and associated environment variables:\n"
            "\n");
diff --git a/scripts/create_config b/scripts/create_config
index 6461ef6..b1adbf5 100755
--- a/scripts/create_config
+++ b/scripts/create_config
@@ -77,16 +77,10 @@ case $line in
     value=${line#*=}
     echo "#define $name $value"
     ;;
- TARGET_ARCH=*) # configuration
-    target_arch=${line#*=}
-    echo "#define TARGET_ARCH \"$target_arch\""
-    ;;
  TARGET_BASE_ARCH=*) # configuration
     target_base_arch=${line#*=}
-    if [ "$target_base_arch" != "$target_arch" ]; then
-      base_arch_name=`echo $target_base_arch | LC_ALL=C tr '[a-z]' '[A-Z]'`
-      echo "#define TARGET_$base_arch_name 1"
-    fi
+    base_arch_name=`echo $target_base_arch | LC_ALL=C tr '[a-z]' '[A-Z]'`
+    echo "#define TARGET_$base_arch_name 1"
     ;;
  TARGET_XML_FILES=*)
     # do nothing
@@ -95,7 +89,8 @@ case $line in
     # do nothing
     ;;
  TARGET_NAME=*)
-    # do nothing
+    target_name=${line#*=}
+    echo "#define TARGET_NAME \"$target_name\""
     ;;
  TARGET_DIRS=*)
     # do nothing
-- 
1.7.9.5

[Qemu-devel] [PULL 05/10] build: drop TARGET_TYPE

[Peter Maydell]

From: Paolo Bonzini <pbonzini@redhat.com>

Just use the TARGET_NAME free string.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 1370349928-20419-6-git-send-email-pbonzini@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 arch_init.c      |    2 +-
 configure        |    1 -
 qapi-schema.json |   18 +-----------------
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/arch_init.c b/arch_init.c
index 23ca953..699c927 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -1094,7 +1094,7 @@ TargetInfo *qmp_query_target(Error **errp)
 {
     TargetInfo *info = g_malloc0(sizeof(*info));
 
-    info->arch = TARGET_TYPE;
+    info->arch = g_strdup(TARGET_NAME);
 
     return info;
 }
diff --git a/configure b/configure
index 46a2173..8732185 100755
--- a/configure
+++ b/configure
@@ -4246,7 +4246,6 @@ upper() {
 target_arch_name="`upper $TARGET_ARCH`"
 echo "TARGET_$target_arch_name=y" >> $config_target_mak
 echo "TARGET_NAME=$target_name" >> $config_target_mak
-echo "TARGET_TYPE=TARGET_TYPE_`upper $target_name`" >> $config_target_mak
 echo "TARGET_BASE_ARCH=$TARGET_BASE_ARCH" >> $config_target_mak
 if [ "$TARGET_ABI_DIR" = "" ]; then
   TARGET_ABI_DIR=$TARGET_ARCH
diff --git a/qapi-schema.json b/qapi-schema.json
index 5ad6894..a80ee40 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -3013,22 +3013,6 @@
 { 'command': 'query-fdsets', 'returns': ['FdsetInfo'] }
 
 ##
-# @TargetType
-#
-# Target CPU emulation type
-#
-# These parameters correspond to the softmmu binary CPU name that is currently
-# running.
-#
-# Since: 1.2.0
-##
-{ 'enum': 'TargetType',
-  'data': [ 'alpha', 'arm', 'cris', 'i386', 'lm32', 'm68k', 'microblazeel',
-            'microblaze', 'mips64el', 'mips64', 'mipsel', 'mips', 'moxie',
-            'or32', 'ppc64', 'ppcemb', 'ppc', 's390x', 'sh4eb', 'sh4',
-            'sparc64', 'sparc', 'unicore32', 'x86_64', 'xtensaeb', 'xtensa' ] }
-
-##
 # @TargetInfo:
 #
 # Information describing the QEMU target.
@@ -3038,7 +3022,7 @@
 # Since: 1.2.0
 ##
 { 'type': 'TargetInfo',
-  'data': { 'arch': 'TargetType' } }
+  'data': { 'arch': 'str' } }
 
 ##
 # @query-target:
-- 
1.7.9.5

[Qemu-devel] [PULL 06/10] configure: dtc: Probe for libfdt_env.h

[Peter Maydell]

From: Peter Crosthwaite <peter.crosthwaite@xilinx.com>

Currently QEMU provides a local clone of the file libfdt_env.h in
/include. This file is supposed to come with the libfdt package and is
only needed for broken installs of libfdt. Now that we have submodule
dtc, just ignore these broken installs and prompt for the dtc submodule
install instead. QEMU's local libfdt_env.h is removed accordingly.

Manifests as a bug when building QEMU with modern libfdt. The new
version of libfdt does not compile when QEMUs libfdt_env.h takes
precedence over the hosts.

Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 9b6a3a52e3f46cfbc1ded9ab56385ec045e46705.1369628289.git.peter.crosthwaite@xilinx.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 configure            |    2 ++
 include/libfdt_env.h |   36 ------------------------------------
 2 files changed, 2 insertions(+), 36 deletions(-)
 delete mode 100644 include/libfdt_env.h

diff --git a/configure b/configure
index 8732185..31b7783 100755
--- a/configure
+++ b/configure
@@ -2488,7 +2488,9 @@ fi
 # fdt probe
 if test "$fdt" != "no" ; then
   fdt_libs="-lfdt"
+  # explicitly check for libfdt_env.h as it is missing in some stable installs
   cat > $TMPC << EOF
+#include <libfdt_env.h>
 int main(void) { return 0; }
 EOF
   if compile_prog "" "$fdt_libs" ; then
diff --git a/include/libfdt_env.h b/include/libfdt_env.h
deleted file mode 100644
index 3667d4c..0000000
--- a/include/libfdt_env.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2, as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright IBM Corp. 2008
- * Authors: Hollis Blanchard <hollisb@us.ibm.com>
- *
- */
-
-#ifndef _LIBFDT_ENV_H
-#define _LIBFDT_ENV_H
-
-#include "qemu/bswap.h"
-
-#ifdef HOST_WORDS_BIGENDIAN
-#define fdt32_to_cpu(x)  (x)
-#define cpu_to_fdt32(x)  (x)
-#define fdt64_to_cpu(x)  (x)
-#define cpu_to_fdt64(x)  (x)
-#else
-#define fdt32_to_cpu(x)  bswap32(x)
-#define cpu_to_fdt32(x)  bswap32(x)
-#define fdt64_to_cpu(x)  bswap64(x)
-#define cpu_to_fdt64(x)  bswap64(x)
-#endif
-
-#endif /* _LIBFDT_ENV_H */
-- 
1.7.9.5

Re: [Qemu-devel] [PULL 06/10] configure: dtc: Probe for libfdt_env.h

[Andreas Färber]

Am 14.06.2013 16:53, schrieb Peter Maydell:
> From: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
> 
> Currently QEMU provides a local clone of the file libfdt_env.h in
> /include. This file is supposed to come with the libfdt package and is
> only needed for broken installs of libfdt. Now that we have submodule
> dtc, just ignore these broken installs and prompt for the dtc submodule
> install instead. QEMU's local libfdt_env.h is removed accordingly.
> 
> Manifests as a bug when building QEMU with modern libfdt. The new
> version of libfdt does not compile when QEMUs libfdt_env.h takes
> precedence over the hosts.
> 
> Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
> Acked-by: David Gibson <david@gibson.dropbear.id.au>
> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
> Acked-by: Paolo Bonzini <pbonzini@redhat.com>
> Message-id: 9b6a3a52e3f46cfbc1ded9ab56385ec045e46705.1369628289.git.peter.crosthwaite@xilinx.com
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>  configure            |    2 ++
>  include/libfdt_env.h |   36 ------------------------------------
>  2 files changed, 2 insertions(+), 36 deletions(-)
>  delete mode 100644 include/libfdt_env.h
> 
> diff --git a/configure b/configure
> index 8732185..31b7783 100755
> --- a/configure
> +++ b/configure
> @@ -2488,7 +2488,9 @@ fi
>  # fdt probe
>  if test "$fdt" != "no" ; then
>    fdt_libs="-lfdt"
> +  # explicitly check for libfdt_env.h as it is missing in some stable installs
>    cat > $TMPC << EOF
> +#include <libfdt_env.h>
>  int main(void) { return 0; }
>  EOF
>    if compile_prog "" "$fdt_libs" ; then

As far as I can see, 1.3.0 is the latest available stable dtc version,
and it doesn't install libfdt_env.h yet apparently. Any chance we can
restore build with dtc 1.3.0 tarball (it used to work fine) while
keeping newer versions working?

Also it seems that dtc submodule build is not multithreading-safe:

$ make -j6
[...]
	CHK version_gen.h
	UPD version_gen.h
	 DEP /home/andreas/QEMU/qemu-cpu/dtc/dtc.c
	CHK version_gen.h
	 CC libfdt/fdt.o
	 CC libfdt/fdt_ro.o
	 CC libfdt/fdt_sw.o
	 CC libfdt/fdt_wip.o
	 CC libfdt/fdt_rw.o
	 CC libfdt/fdt_strerror.o
	 AR libfdt/libfdt.a
ar: two different operation options specified
make[1]: *** [libfdt/libfdt.a] Fehler 1
make: *** [subdir-dtc] Fehler 2

$ make
	CHK version_gen.h
	 AR libfdt/libfdt.a
ar: creating libfdt/libfdt.a
a - libfdt/fdt.o
a - libfdt/fdt_ro.o
a - libfdt/fdt_wip.o
a - libfdt/fdt_sw.o
a - libfdt/fdt_rw.o
a - libfdt/fdt_strerror.o
  GEN   qapi-types.c
[...]

Regards,
Andreas

> diff --git a/include/libfdt_env.h b/include/libfdt_env.h
> deleted file mode 100644
> index 3667d4c..0000000
> --- a/include/libfdt_env.h
> +++ /dev/null
> @@ -1,36 +0,0 @@
> -/*
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License, version 2, as
> - * published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
> - *
> - * You should have received a copy of the GNU General Public License
> - * along with this program; if not, see <http://www.gnu.org/licenses/>.
> - *
> - * Copyright IBM Corp. 2008
> - * Authors: Hollis Blanchard <hollisb@us.ibm.com>
> - *
> - */
> -
> -#ifndef _LIBFDT_ENV_H
> -#define _LIBFDT_ENV_H
> -
> -#include "qemu/bswap.h"
> -
> -#ifdef HOST_WORDS_BIGENDIAN
> -#define fdt32_to_cpu(x)  (x)
> -#define cpu_to_fdt32(x)  (x)
> -#define fdt64_to_cpu(x)  (x)
> -#define cpu_to_fdt64(x)  (x)
> -#else
> -#define fdt32_to_cpu(x)  bswap32(x)
> -#define cpu_to_fdt32(x)  bswap32(x)
> -#define fdt64_to_cpu(x)  bswap64(x)
> -#define cpu_to_fdt64(x)  bswap64(x)
> -#endif
> -
> -#endif /* _LIBFDT_ENV_H */
> 


-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Re: [Qemu-devel] [PULL 06/10] configure: dtc: Probe for libfdt_env.h

[Peter Maydell]

On 18 June 2013 00:24, Andreas Färber <afaerber@suse.de> wrote:
> As far as I can see, 1.3.0 is the latest available stable dtc version,
> and it doesn't install libfdt_env.h yet apparently. Any chance we can
> restore build with dtc 1.3.0 tarball (it used to work fine) while
> keeping newer versions working?

I wanted to keep things simple, ie just require a distro
version of libfdt to be installed the way upstream say it
should be, rather than second-guessing whether a broken
libfdt is or isn't going to work with our libfdt_env.h.
Also, a lot of people out there are probably going to end
up building against the submodule libfdt, so it's helpful
to have at least some of the qemu developers building that
way too...

> Also it seems that dtc submodule build is not multithreading-safe:

...it helps reveal bugs like this one before release
rather than afterwards. I'm having trouble figuring out
why it doesn't work, though (I usually run with at least
j3 and it's fine, plus the makefile rules are pretty
simple) -- can you reproduce with V=1 so we can see what
commands are actually being run?

thanks
-- PMM

Re: [Qemu-devel] [PULL 06/10] configure: dtc: Probe for libfdt_env.h

[David Gibson]

[-- Attachment #1: Type: text/plain, Size: 1612 bytes --]

On Tue, Jun 18, 2013 at 12:44:02AM +0100, Peter Maydell wrote:
> On 18 June 2013 00:24, Andreas Färber <afaerber@suse.de> wrote:
> > As far as I can see, 1.3.0 is the latest available stable dtc version,
> > and it doesn't install libfdt_env.h yet apparently. Any chance we can
> > restore build with dtc 1.3.0 tarball (it used to work fine) while
> > keeping newer versions working?
> 
> I wanted to keep things simple, ie just require a distro
> version of libfdt to be installed the way upstream say it
> should be, rather than second-guessing whether a broken
> libfdt is or isn't going to work with our libfdt_env.h.
> Also, a lot of people out there are probably going to end
> up building against the submodule libfdt, so it's helpful
> to have at least some of the qemu developers building that
> way too...
> 
> > Also it seems that dtc submodule build is not multithreading-safe:
> 
> ...it helps reveal bugs like this one before release
> rather than afterwards. I'm having trouble figuring out
> why it doesn't work, though (I usually run with at least
> j3 and it's fine, plus the makefile rules are pretty
> simple) -- can you reproduce with V=1 so we can see what
> commands are actually being run?

Likewise.  I can't see why that wouldn't work.  V=1 might help,
although V=1 also changes the options to AR (adds verbose mode), so I
hope that doesn't mess up the results.

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: [Qemu-devel] [PULL 06/10] configure: dtc: Probe for libfdt_env.h

[Andreas Färber]

Am 18.06.2013 01:44, schrieb Peter Maydell:
> On 18 June 2013 00:24, Andreas Färber <afaerber@suse.de> wrote:
>> As far as I can see, 1.3.0 is the latest available stable dtc version,
>> and it doesn't install libfdt_env.h yet apparently. Any chance we can
>> restore build with dtc 1.3.0 tarball (it used to work fine) while
>> keeping newer versions working?
> 
> I wanted to keep things simple, ie just require a distro
> version of libfdt to be installed the way upstream say it
> should be, rather than second-guessing whether a broken
> libfdt is or isn't going to work with our libfdt_env.h.

Quote: "(1) Preferred: Install the DTC devel package"

Just to clarify: I am pointing out that apparently there is *no* stable
version 1.4.0 or 1.3.1 that installs the expected libfdt_env.h:

http://git.jdl.com/gitweb/?p=dtc.git;a=tags

And I believe a request to package a random git commit for openSUSE
distro is going to be declined.

So I would be perfectly happy if the dtc maintainers were to provide an
official tarball that I can get into our distribution. Then we don't
need to tweak QEMU's configure at all. :)

> Also, a lot of people out there are probably going to end
> up building against the submodule libfdt, so it's helpful
> to have at least some of the qemu developers building that
> way too...
> 
>> Also it seems that dtc submodule build is not multithreading-safe:
> 
> ...it helps reveal bugs like this one before release
> rather than afterwards.

Yeah, I did write I wanted to test it but didn't get to it immediately
and later forgot. :$

> I'm having trouble figuring out
> why it doesn't work, though (I usually run with at least
> j3 and it's fine, plus the makefile rules are pretty
> simple) -- can you reproduce with V=1 so we can see what
> commands are actually being run?

Here you go, for the next repository:

$ make -j6 V=1
config-host.mak is out-of-date, running configure
python /home/andreas/QEMU/qemu-ppc/scripts/qapi-commands.py -h -m -o "."
< /home/andreas/QEMU/qemu-ppc/qapi-schema.json
python /home/andreas/QEMU/qemu-ppc/scripts/qapi-types.py -h -o "." -b <
/home/andreas/QEMU/qemu-ppc/qapi-schema.json
python /home/andreas/QEMU/qemu-ppc/scripts/qapi-visit.py -h -o "." -b <
/home/andreas/QEMU/qemu-ppc/qapi-schema.json
Install prefix    /usr/local
BIOS directory    /usr/local/share/qemu
binary directory  /usr/local/bin
library directory /usr/local/lib
libexec directory /usr/local/libexec
include directory /usr/local/include
config directory  /usr/local/etc
local state directory   /usr/local/var
Manual directory  /usr/local/share/man
ELF interp prefix /usr/gnemul/qemu-%M
Source path       /home/andreas/QEMU/qemu-ppc
C compiler        cc
Host C compiler   cc
Objective-C compiler clang
CFLAGS            -O2 -D_FORTIFY_SOURCE=2 -g
QEMU_CFLAGS       -Werror -fPIE -DPIE -m64 -D_GNU_SOURCE
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes
-Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes
-fno-strict-aliasing  -Wendif-labels -Wmissing-include-dirs -Wempty-body
-Wnested-externs -Wformat-security -Wformat-y2k -Winit-self
-Wignored-qualifiers -Wold-style-declaration -Wold-style-definition
-Wtype-limits -fstack-protector-all -I/usr/include/libseccomp-1.0.1
-I/usr/include/libpng15   -I/usr/include/spice-server
-I/usr/include/pixman-1 -I/usr/include/spice-1   -I/usr/include/pixman-1
  -I$(SRC_PATH)/dtc/libfdt
LDFLAGS           -Wl,--warn-common -Wl,-z,relro -Wl,-z,now -pie -m64 -g
make              make
install           install
python            python
smbd              /usr/sbin/smbd
host CPU          x86_64
host big endian   no
target list       ppc-softmmu ppc64-softmmu ppcemb-softmmu
ppc-linux-user ppc64-linux-user ppc64abi32-linux-user
tcg debug enabled no
gprof enabled     no
sparse enabled    no
strip binaries    yes
profiler          no
static build      no
-Werror enabled   yes
pixman            system
SDL support       yes
GTK support       yes
curses support    yes
curl support      yes
mingw32 support   no
Audio drivers     oss
Block whitelist (rw)
Block whitelist (ro)
Mixer emulation   no
VirtFS support    yes
VNC support       yes
VNC TLS support   no
VNC SASL support  no
VNC JPEG support  no
VNC PNG support   yes
VNC WS support    no
xen support       yes
brlapi support    no
bluez  support    no
Documentation     no
NPTL support      yes
GUEST_BASE        yes
PIE               yes
vde support       no
Linux AIO support yes
ATTR/XATTR support yes
Install blobs     yes
KVM support       yes
TCG interpreter   no
fdt support       yes
preadv support    yes
fdatasync         yes
madvise           yes
posix_madvise     yes
sigev_thread_id   yes
uuid support      yes
libcap-ng support yes
vhost-net support yes
vhost-scsi support yes
Trace backend     nop
Trace output file trace-<pid>
spice support     yes (0.12.3/0.12.0)
rbd support       no
xfsctl support    no
nss used          no
libusb            no
usb net redir     no
GLX support       yes
libiscsi support  no
build guest agent yes
seccomp support   yes
coroutine backend ucontext
GlusterFS support no
virtio-blk-data-plane yes
gcov              gcov
gcov enabled      no
TPM support       no
libssh2 support   no
TPM passthrough   no
QOM debugging     yes
sh /home/andreas/QEMU/qemu-ppc/scripts/create_config < config-host.mak >
config-host.h-timestamp
mkdir -p dtc/libfdt
mkdir -p dtc/tests
python /home/andreas/QEMU/qemu-ppc/scripts/tracetool.py --format=h
--backend=nop < /home/andreas/QEMU/qemu-ppc/trace-events >
trace/generated-tracers.h-timestamp
make -I/home/andreas/QEMU/qemu-ppc/dtc
VPATH=/home/andreas/QEMU/qemu-ppc/dtc -C dtc V="1"
LIBFDT_srcdir=/home/andreas/QEMU/qemu-ppc/dtc/libfdt CFLAGS="-O2
-D_FORTIFY_SOURCE=2 -g  -Werror -fPIE -DPIE -m64 -D_GNU_SOURCE
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes
-Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes
-fno-strict-aliasing  -Wendif-labels -Wmissing-include-dirs -Wempty-body
-Wnested-externs -Wformat-security -Wformat-y2k -Winit-self
-Wignored-qualifiers -Wold-style-declaration -Wold-style-definition
-Wtype-limits -fstack-protector-all -I/usr/include/libseccomp-1.0.1
-I/usr/include/libpng15   -I/usr/include/spice-server
-I/usr/include/pixman-1 -I/usr/include/spice-1   -I/usr/include/pixman-1
  -I/home/andreas/QEMU/qemu-ppc/dtc/libfdt -pthread
-I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include
-I/home/andreas/QEMU/qemu-ppc/tests -I/home/andreas/QEMU/build-ppc/dtc
-I/home/andreas/QEMU/qemu-ppc/dtc
-I/home/andreas/QEMU/qemu-ppc/dtc/libfdt" LDFLAGS="-Wl,--warn-common
-Wl,-z,relro -Wl,-z,now -pie -m64 -g " ARFLAGS="" CC="cc" AR="ar"
LD="ld"  BUILD_DIR=/home/andreas/QEMU/build-ppc libfdt/libfdt.a
make[1]: Entering directory `/home/andreas/QEMU/build-ppc/dtc'
cc -I libfdt -MM -MG -MT "tests/trees.o tests/trees.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/trees.S > tests/trees.d
cc -I libfdt -MM -MG -MT "tests/dumptrees.o tests/dumptrees.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/dumptrees.c > tests/dumptrees.d
cc -I libfdt -MM -MG -MT "tests/value-labels.o tests/value-labels.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/value-labels.c > tests/value-labels.d
cc -I libfdt -MM -MG -MT "tests/testutils.o tests/testutils.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/testutils.c > tests/testutils.d
cc -I libfdt -MM -MG -MT "tests/asm_tree_dump.o tests/asm_tree_dump.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/asm_tree_dump.c >
tests/asm_tree_dump.d
cc -I libfdt -MM -MG -MT "tests/truncated_property.o
tests/truncated_property.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/truncated_property.c >
tests/truncated_property.d
cc -I libfdt -MM -MG -MT "tests/add_subnode_with_nops.o
tests/add_subnode_with_nops.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/add_subnode_with_nops.c >
tests/add_subnode_with_nops.d
cc -I libfdt -MM -MG -MT "tests/path_offset_aliases.o
tests/path_offset_aliases.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/path_offset_aliases.c >
tests/path_offset_aliases.d
cc -I libfdt -MM -MG -MT "tests/dtbs_equal_unordered.o
tests/dtbs_equal_unordered.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/dtbs_equal_unordered.c >
tests/dtbs_equal_unordered.d
cc -I libfdt -MM -MG -MT "tests/dtb_reverse.o tests/dtb_reverse.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/dtb_reverse.c > tests/dtb_reverse.d
cc -I libfdt -MM -MG -MT "tests/dtbs_equal_ordered.o
tests/dtbs_equal_ordered.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/dtbs_equal_ordered.c >
tests/dtbs_equal_ordered.d
cc -I libfdt -MM -MG -MT "tests/extra-terminating-null.o
tests/extra-terminating-null.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/extra-terminating-null.c >
tests/extra-terminating-null.d
cc -I libfdt -MM -MG -MT "tests/incbin.o tests/incbin.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/incbin.c > tests/incbin.d
cc -I libfdt -MM -MG -MT "tests/boot-cpuid.o tests/boot-cpuid.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/boot-cpuid.c > tests/boot-cpuid.d
cc -I libfdt -MM -MG -MT "tests/phandle_format.o tests/phandle_format.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/phandle_format.c >
tests/phandle_format.d
cc -I libfdt -MM -MG -MT "tests/path-references.o
tests/path-references.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/path-references.c >
tests/path-references.d
cc -I libfdt -MM -MG -MT "tests/references.o tests/references.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/references.c > tests/references.d
cc -I libfdt -MM -MG -MT "tests/string_escapes.o tests/string_escapes.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/string_escapes.c >
tests/string_escapes.d
cc -I libfdt -MM -MG -MT "tests/del_node.o tests/del_node.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/del_node.c > tests/del_node.d
cc -I libfdt -MM -MG -MT "tests/del_property.o tests/del_property.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/del_property.c > tests/del_property.d
cc -I libfdt -MM -MG -MT "tests/setprop.o tests/setprop.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/setprop.c > tests/setprop.d
cc -I libfdt -MM -MG -MT "tests/set_name.o tests/set_name.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/set_name.c > tests/set_name.d
cc -I libfdt -MM -MG -MT "tests/rw_tree1.o tests/rw_tree1.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/rw_tree1.c > tests/rw_tree1.d
cc -I libfdt -MM -MG -MT "tests/open_pack.o tests/open_pack.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/open_pack.c > tests/open_pack.d
cc -I libfdt -MM -MG -MT "tests/nopulate.o tests/nopulate.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/nopulate.c > tests/nopulate.d
cc -I libfdt -MM -MG -MT "tests/mangle-layout.o tests/mangle-layout.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/mangle-layout.c >
tests/mangle-layout.d
cc -I libfdt -MM -MG -MT "tests/move_and_save.o tests/move_and_save.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/move_and_save.c >
tests/move_and_save.d
cc -I libfdt -MM -MG -MT "tests/sw_tree1.o tests/sw_tree1.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/sw_tree1.c > tests/sw_tree1.d
cc -I libfdt -MM -MG -MT "tests/nop_node.o tests/nop_node.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/nop_node.c > tests/nop_node.d
cc -I libfdt -MM -MG -MT "tests/nop_property.o tests/nop_property.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/nop_property.c > tests/nop_property.d
cc -I libfdt -MM -MG -MT "tests/setprop_inplace.o
tests/setprop_inplace.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/setprop_inplace.c >
tests/setprop_inplace.d
cc -I libfdt -MM -MG -MT "tests/notfound.o tests/notfound.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/notfound.c > tests/notfound.d
cc -I libfdt -MM -MG -MT "tests/get_alias.o tests/get_alias.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/get_alias.c > tests/get_alias.d
cc -I libfdt -MM -MG -MT "tests/node_offset_by_compatible.o
tests/node_offset_by_compatible.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/node_offset_by_compatible.c >
tests/node_offset_by_compatible.d
cc -I libfdt -MM -MG -MT "tests/node_check_compatible.o
tests/node_check_compatible.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/node_check_compatible.c >
tests/node_check_compatible.d
cc -I libfdt -MM -MG -MT "tests/node_offset_by_phandle.o
tests/node_offset_by_phandle.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/node_offset_by_phandle.c >
tests/node_offset_by_phandle.d
cc -I libfdt -MM -MG -MT "tests/node_offset_by_prop_value.o
tests/node_offset_by_prop_value.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/node_offset_by_prop_value.c >
tests/node_offset_by_prop_value.d
cc -I libfdt -MM -MG -MT "tests/parent_offset.o tests/parent_offset.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/parent_offset.c >
tests/parent_offset.d
cc -I libfdt -MM -MG -MT "tests/supernode_atdepth_offset.o
tests/supernode_atdepth_offset.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/supernode_atdepth_offset.c >
tests/supernode_atdepth_offset.d
cc -I libfdt -MM -MG -MT "tests/get_path.o tests/get_path.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/get_path.c > tests/get_path.d
cc -I libfdt -MM -MG -MT "tests/get_phandle.o tests/get_phandle.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/get_phandle.c > tests/get_phandle.d
cc -I libfdt -MM -MG -MT "tests/getprop.o tests/getprop.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/getprop.c > tests/getprop.d
cc -I libfdt -MM -MG -MT "tests/get_name.o tests/get_name.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/get_name.c > tests/get_name.d
cc -I libfdt -MM -MG -MT "tests/path_offset.o tests/path_offset.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/path_offset.c > tests/path_offset.d
cc -I libfdt -MM -MG -MT "tests/subnode_offset.o tests/subnode_offset.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/subnode_offset.c >
tests/subnode_offset.d
cc -I libfdt -MM -MG -MT "tests/find_property.o tests/find_property.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/find_property.c >
tests/find_property.d
cc -I libfdt -MM -MG -MT "tests/root_node.o tests/root_node.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/root_node.c > tests/root_node.d
cc -I libfdt -MM -MG -MT "tests/get_mem_rsv.o tests/get_mem_rsv.d"
/home/andreas/QEMU/qemu-ppc/dtc/tests/get_mem_rsv.c > tests/get_mem_rsv.d
cc -I libfdt -MM -MG -MT "libfdt/fdt_strerror.o libfdt/fdt_strerror.d"
/home/andreas/QEMU/qemu-ppc/dtc/libfdt/fdt_strerror.c >
libfdt/fdt_strerror.d
cc -I libfdt -MM -MG -MT "libfdt/fdt_rw.o libfdt/fdt_rw.d"
/home/andreas/QEMU/qemu-ppc/dtc/libfdt/fdt_rw.c > libfdt/fdt_rw.d
cc -I libfdt -MM -MG -MT "libfdt/fdt_sw.o libfdt/fdt_sw.d"
/home/andreas/QEMU/qemu-ppc/dtc/libfdt/fdt_sw.c > libfdt/fdt_sw.d
cc -I libfdt -MM -MG -MT "libfdt/fdt_wip.o libfdt/fdt_wip.d"
/home/andreas/QEMU/qemu-ppc/dtc/libfdt/fdt_wip.c > libfdt/fdt_wip.d
cc -I libfdt -MM -MG -MT "libfdt/fdt_ro.o libfdt/fdt_ro.d"
/home/andreas/QEMU/qemu-ppc/dtc/libfdt/fdt_ro.c > libfdt/fdt_ro.d
cc -I libfdt -MM -MG -MT "libfdt/fdt.o libfdt/fdt.d"
/home/andreas/QEMU/qemu-ppc/dtc/libfdt/fdt.c > libfdt/fdt.d
cc -I libfdt -MM -MG -MT "ftdump.o ftdump.d"
/home/andreas/QEMU/qemu-ppc/dtc/ftdump.c > ftdump.d
flex -oconvert-dtsv0-lexer.lex.c
/home/andreas/QEMU/qemu-ppc/dtc/convert-dtsv0-lexer.l
cc -I libfdt -MM -MG -MT "util.o util.d"
/home/andreas/QEMU/qemu-ppc/dtc/util.c > util.d
cc -I libfdt -MM -MG -MT "srcpos.o srcpos.d"
/home/andreas/QEMU/qemu-ppc/dtc/srcpos.c > srcpos.d
flex -odtc-lexer.lex.c /home/andreas/QEMU/qemu-ppc/dtc/dtc-lexer.l
bison -d /home/andreas/QEMU/qemu-ppc/dtc/dtc-parser.y
cc -I libfdt -MM -MG -MT "treesource.o treesource.d"
/home/andreas/QEMU/qemu-ppc/dtc/treesource.c > treesource.d
cc -I libfdt -MM -MG -MT "livetree.o livetree.d"
/home/andreas/QEMU/qemu-ppc/dtc/livetree.c > livetree.d
cc -I libfdt -MM -MG -MT "fstree.o fstree.d"
/home/andreas/QEMU/qemu-ppc/dtc/fstree.c > fstree.d
cc -I libfdt -MM -MG -MT "flattree.o flattree.d"
/home/andreas/QEMU/qemu-ppc/dtc/flattree.c > flattree.d
cc -I libfdt -MM -MG -MT "dtc.o dtc.d"
/home/andreas/QEMU/qemu-ppc/dtc/dtc.c > dtc.d
cc -I libfdt -MM -MG -MT "data.o data.d"
/home/andreas/QEMU/qemu-ppc/dtc/data.c > data.d
cc -I libfdt -MM -MG -MT "checks.o checks.d"
/home/andreas/QEMU/qemu-ppc/dtc/checks.c > checks.d
cc -I libfdt -MM -MG -MT "convert-dtsv0-lexer.lex.o
convert-dtsv0-lexer.lex.d" convert-dtsv0-lexer.lex.c >
convert-dtsv0-lexer.lex.d
cc -I libfdt -MM -MG -MT "dtc-parser.tab.o dtc-parser.tab.d"
dtc-parser.tab.c > dtc-parser.tab.d
cc -I libfdt -MM -MG -MT "dtc-lexer.lex.o dtc-lexer.lex.d"
dtc-lexer.lex.c > dtc-lexer.lex.d
make[1]: Leaving directory `/home/andreas/QEMU/build-ppc/dtc'
make[1]: Entering directory `/home/andreas/QEMU/build-ppc/dtc'
set -e; echo '	CHK version_gen.h'; mkdir -p ./; 	(echo "#define
DTC_VERSION \"DTC 1.3.0\""; ) < Makefile > version_gen.h.tmp; if [ -r
version_gen.h ] && cmp -s version_gen.h version_gen.h.tmp; then rm -f
version_gen.h.tmp; else echo '	UPD version_gen.h'; mv -f
version_gen.h.tmp version_gen.h; fi;
	CHK version_gen.h
	UPD version_gen.h
cc -I libfdt -MM -MG -MT "dtc.o dtc.d"
/home/andreas/QEMU/qemu-ppc/dtc/dtc.c > dtc.d
make[1]: Leaving directory `/home/andreas/QEMU/build-ppc/dtc'
make[1]: Entering directory `/home/andreas/QEMU/build-ppc/dtc'
set -e; echo '	CHK version_gen.h'; mkdir -p ./; 	(echo "#define
DTC_VERSION \"DTC 1.3.0\""; ) < Makefile > version_gen.h.tmp; if [ -r
version_gen.h ] && cmp -s version_gen.h version_gen.h.tmp; then rm -f
version_gen.h.tmp; else echo '	UPD version_gen.h'; mv -f
version_gen.h.tmp version_gen.h; fi;
	CHK version_gen.h
cc -I libfdt -O2 -D_FORTIFY_SOURCE=2 -g  -Werror -fPIE -DPIE -m64
-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings
-Wmissing-prototypes -fno-strict-aliasing  -Wendif-labels
-Wmissing-include-dirs -Wempty-body -Wnested-externs -Wformat-security
-Wformat-y2k -Winit-self -Wignored-qualifiers -Wold-style-declaration
-Wold-style-definition -Wtype-limits -fstack-protector-all
-I/usr/include/libseccomp-1.0.1   -I/usr/include/libpng15
-I/usr/include/spice-server -I/usr/include/pixman-1
-I/usr/include/spice-1   -I/usr/include/pixman-1
-I/home/andreas/QEMU/qemu-ppc/dtc/libfdt -pthread
-I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include
-I/home/andreas/QEMU/qemu-ppc/tests -I/home/andreas/QEMU/build-ppc/dtc
-I/home/andreas/QEMU/qemu-ppc/dtc
-I/home/andreas/QEMU/qemu-ppc/dtc/libfdt -o libfdt/fdt_ro.o -c
/home/andreas/QEMU/qemu-ppc/dtc/libfdt/fdt_ro.c
cc -I libfdt -O2 -D_FORTIFY_SOURCE=2 -g  -Werror -fPIE -DPIE -m64
-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings
-Wmissing-prototypes -fno-strict-aliasing  -Wendif-labels
-Wmissing-include-dirs -Wempty-body -Wnested-externs -Wformat-security
-Wformat-y2k -Winit-self -Wignored-qualifiers -Wold-style-declaration
-Wold-style-definition -Wtype-limits -fstack-protector-all
-I/usr/include/libseccomp-1.0.1   -I/usr/include/libpng15
-I/usr/include/spice-server -I/usr/include/pixman-1
-I/usr/include/spice-1   -I/usr/include/pixman-1
-I/home/andreas/QEMU/qemu-ppc/dtc/libfdt -pthread
-I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include
-I/home/andreas/QEMU/qemu-ppc/tests -I/home/andreas/QEMU/build-ppc/dtc
-I/home/andreas/QEMU/qemu-ppc/dtc
-I/home/andreas/QEMU/qemu-ppc/dtc/libfdt -o libfdt/fdt.o -c
/home/andreas/QEMU/qemu-ppc/dtc/libfdt/fdt.c
cc -I libfdt -O2 -D_FORTIFY_SOURCE=2 -g  -Werror -fPIE -DPIE -m64
-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings
-Wmissing-prototypes -fno-strict-aliasing  -Wendif-labels
-Wmissing-include-dirs -Wempty-body -Wnested-externs -Wformat-security
-Wformat-y2k -Winit-self -Wignored-qualifiers -Wold-style-declaration
-Wold-style-definition -Wtype-limits -fstack-protector-all
-I/usr/include/libseccomp-1.0.1   -I/usr/include/libpng15
-I/usr/include/spice-server -I/usr/include/pixman-1
-I/usr/include/spice-1   -I/usr/include/pixman-1
-I/home/andreas/QEMU/qemu-ppc/dtc/libfdt -pthread
-I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include
-I/home/andreas/QEMU/qemu-ppc/tests -I/home/andreas/QEMU/build-ppc/dtc
-I/home/andreas/QEMU/qemu-ppc/dtc
-I/home/andreas/QEMU/qemu-ppc/dtc/libfdt -o libfdt/fdt_wip.o -c
/home/andreas/QEMU/qemu-ppc/dtc/libfdt/fdt_wip.c
cc -I libfdt -O2 -D_FORTIFY_SOURCE=2 -g  -Werror -fPIE -DPIE -m64
-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings
-Wmissing-prototypes -fno-strict-aliasing  -Wendif-labels
-Wmissing-include-dirs -Wempty-body -Wnested-externs -Wformat-security
-Wformat-y2k -Winit-self -Wignored-qualifiers -Wold-style-declaration
-Wold-style-definition -Wtype-limits -fstack-protector-all
-I/usr/include/libseccomp-1.0.1   -I/usr/include/libpng15
-I/usr/include/spice-server -I/usr/include/pixman-1
-I/usr/include/spice-1   -I/usr/include/pixman-1
-I/home/andreas/QEMU/qemu-ppc/dtc/libfdt -pthread
-I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include
-I/home/andreas/QEMU/qemu-ppc/tests -I/home/andreas/QEMU/build-ppc/dtc
-I/home/andreas/QEMU/qemu-ppc/dtc
-I/home/andreas/QEMU/qemu-ppc/dtc/libfdt -o libfdt/fdt_sw.o -c
/home/andreas/QEMU/qemu-ppc/dtc/libfdt/fdt_sw.c
cc -I libfdt -O2 -D_FORTIFY_SOURCE=2 -g  -Werror -fPIE -DPIE -m64
-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings
-Wmissing-prototypes -fno-strict-aliasing  -Wendif-labels
-Wmissing-include-dirs -Wempty-body -Wnested-externs -Wformat-security
-Wformat-y2k -Winit-self -Wignored-qualifiers -Wold-style-declaration
-Wold-style-definition -Wtype-limits -fstack-protector-all
-I/usr/include/libseccomp-1.0.1   -I/usr/include/libpng15
-I/usr/include/spice-server -I/usr/include/pixman-1
-I/usr/include/spice-1   -I/usr/include/pixman-1
-I/home/andreas/QEMU/qemu-ppc/dtc/libfdt -pthread
-I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include
-I/home/andreas/QEMU/qemu-ppc/tests -I/home/andreas/QEMU/build-ppc/dtc
-I/home/andreas/QEMU/qemu-ppc/dtc
-I/home/andreas/QEMU/qemu-ppc/dtc/libfdt -o libfdt/fdt_rw.o -c
/home/andreas/QEMU/qemu-ppc/dtc/libfdt/fdt_rw.c
cc -I libfdt -O2 -D_FORTIFY_SOURCE=2 -g  -Werror -fPIE -DPIE -m64
-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings
-Wmissing-prototypes -fno-strict-aliasing  -Wendif-labels
-Wmissing-include-dirs -Wempty-body -Wnested-externs -Wformat-security
-Wformat-y2k -Winit-self -Wignored-qualifiers -Wold-style-declaration
-Wold-style-definition -Wtype-limits -fstack-protector-all
-I/usr/include/libseccomp-1.0.1   -I/usr/include/libpng15
-I/usr/include/spice-server -I/usr/include/pixman-1
-I/usr/include/spice-1   -I/usr/include/pixman-1
-I/home/andreas/QEMU/qemu-ppc/dtc/libfdt -pthread
-I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include
-I/home/andreas/QEMU/qemu-ppc/tests -I/home/andreas/QEMU/build-ppc/dtc
-I/home/andreas/QEMU/qemu-ppc/dtc
-I/home/andreas/QEMU/qemu-ppc/dtc/libfdt -o libfdt/fdt_strerror.o -c
/home/andreas/QEMU/qemu-ppc/dtc/libfdt/fdt_strerror.c
ar  libfdt/libfdt.a libfdt/fdt.o libfdt/fdt_ro.o libfdt/fdt_wip.o
libfdt/fdt_sw.o libfdt/fdt_rw.o libfdt/fdt_strerror.o
ar: two different operation options specified
make[1]: *** [libfdt/libfdt.a] Fehler 1
make[1]: Leaving directory `/home/andreas/QEMU/build-ppc/dtc'
make: *** [subdir-dtc] Fehler 2

Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Re: [Qemu-devel] [PULL 06/10] configure: dtc: Probe for libfdt_env.h

[Peter Crosthwaite]

On Tue, Jun 18, 2013 at 10:46 AM, Andreas Färber <afaerber@suse.de> wrote:
> Am 18.06.2013 01:44, schrieb Peter Maydell:
>> On 18 June 2013 00:24, Andreas Färber <afaerber@suse.de> wrote:
>>> As far as I can see, 1.3.0 is the latest available stable dtc version,
>>> and it doesn't install libfdt_env.h yet apparently. Any chance we can
>>> restore build with dtc 1.3.0 tarball (it used to work fine) while
>>> keeping newer versions working?
>>
>> I wanted to keep things simple, ie just require a distro
>> version of libfdt to be installed the way upstream say it
>> should be, rather than second-guessing whether a broken
>> libfdt is or isn't going to work with our libfdt_env.h.
>
> Quote: "(1) Preferred: Install the DTC devel package"
>
> Just to clarify: I am pointing out that apparently there is *no* stable
> version 1.4.0 or 1.3.1 that installs the expected libfdt_env.h:
>
> http://git.jdl.com/gitweb/?p=dtc.git;a=tags
>
> And I believe a request to package a random git commit for openSUSE
> distro is going to be declined.
>
> So I would be perfectly happy if the dtc maintainers were to provide an
> official tarball that I can get into our distribution. Then we don't
> need to tweak QEMU's configure at all. :)
>

Yes, this is massively overdue. Bugfixes aside DTC has seen some
significant feature development since 1.3.0.

Regards,
Peter

>> Also, a lot of people out there are probably going to end
>> up building against the submodule libfdt, so it's helpful
>> to have at least some of the qemu developers building that
>> way too...
>>
>>> Also it seems that dtc submodule build is not multithreading-safe:
>>
>> ...it helps reveal bugs like this one before release
>> rather than afterwards.
>
> Yeah, I did write I wanted to test it but didn't get to it immediately
> and later forgot. :$
>
>> I'm having trouble figuring out
>> why it doesn't work, though (I usually run with at least
>> j3 and it's fine, plus the makefile rules are pretty
>> simple) -- can you reproduce with V=1 so we can see what
>> commands are actually being run?
>
> Here you go, for the next repository:
>
> $ make -j6 V=1
> config-host.mak is out-of-date, running configure
> python /home/andreas/QEMU/qemu-ppc/scripts/qapi-commands.py -h -m -o "."
> < /home/andreas/QEMU/qemu-ppc/qapi-schema.json
> python /home/andreas/QEMU/qemu-ppc/scripts/qapi-types.py -h -o "." -b <
> /home/andreas/QEMU/qemu-ppc/qapi-schema.json
> python /home/andreas/QEMU/qemu-ppc/scripts/qapi-visit.py -h -o "." -b <
> /home/andreas/QEMU/qemu-ppc/qapi-schema.json
> Install prefix    /usr/local
> BIOS directory    /usr/local/share/qemu
> binary directory  /usr/local/bin
> library directory /usr/local/lib
> libexec directory /usr/local/libexec
> include directory /usr/local/include
> config directory  /usr/local/etc
> local state directory   /usr/local/var
> Manual directory  /usr/local/share/man
> ELF interp prefix /usr/gnemul/qemu-%M
> Source path       /home/andreas/QEMU/qemu-ppc
> C compiler        cc
> Host C compiler   cc
> Objective-C compiler clang
> CFLAGS            -O2 -D_FORTIFY_SOURCE=2 -g
> QEMU_CFLAGS       -Werror -fPIE -DPIE -m64 -D_GNU_SOURCE
> -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes
> -Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes
> -fno-strict-aliasing  -Wendif-labels -Wmissing-include-dirs -Wempty-body
> -Wnested-externs -Wformat-security -Wformat-y2k -Winit-self
> -Wignored-qualifiers -Wold-style-declaration -Wold-style-definition
> -Wtype-limits -fstack-protector-all -I/usr/include/libseccomp-1.0.1
> -I/usr/include/libpng15   -I/usr/include/spice-server
> -I/usr/include/pixman-1 -I/usr/include/spice-1   -I/usr/include/pixman-1
>   -I$(SRC_PATH)/dtc/libfdt
> LDFLAGS           -Wl,--warn-common -Wl,-z,relro -Wl,-z,now -pie -m64 -g
> make              make
> install           install
> python            python
> smbd              /usr/sbin/smbd
> host CPU          x86_64
> host big endian   no
> target list       ppc-softmmu ppc64-softmmu ppcemb-softmmu
> ppc-linux-user ppc64-linux-user ppc64abi32-linux-user
> tcg debug enabled no
> gprof enabled     no
> sparse enabled    no
> strip binaries    yes
> profiler          no
> static build      no
> -Werror enabled   yes
> pixman            system
> SDL support       yes
> GTK support       yes
> curses support    yes
> curl support      yes
> mingw32 support   no
> Audio drivers     oss
> Block whitelist (rw)
> Block whitelist (ro)
> Mixer emulation   no
> VirtFS support    yes
> VNC support       yes
> VNC TLS support   no
> VNC SASL support  no
> VNC JPEG support  no
> VNC PNG support   yes
> VNC WS support    no
> xen support       yes
> brlapi support    no
> bluez  support    no
> Documentation     no
> NPTL support      yes
> GUEST_BASE        yes
> PIE               yes
> vde support       no
> Linux AIO support yes
> ATTR/XATTR support yes
> Install blobs     yes
> KVM support       yes
> TCG interpreter   no
> fdt support       yes
> preadv support    yes
> fdatasync         yes
> madvise           yes
> posix_madvise     yes
> sigev_thread_id   yes
> uuid support      yes
> libcap-ng support yes
> vhost-net support yes
> vhost-scsi support yes
> Trace backend     nop
> Trace output file trace-<pid>
> spice support     yes (0.12.3/0.12.0)
> rbd support       no
> xfsctl support    no
> nss used          no
> libusb            no
> usb net redir     no
> GLX support       yes
> libiscsi support  no
> build guest agent yes
> seccomp support   yes
> coroutine backend ucontext
> GlusterFS support no
> virtio-blk-data-plane yes
> gcov              gcov
> gcov enabled      no
> TPM support       no
> libssh2 support   no
> TPM passthrough   no
> QOM debugging     yes
> sh /home/andreas/QEMU/qemu-ppc/scripts/create_config < config-host.mak >
> config-host.h-timestamp
> mkdir -p dtc/libfdt
> mkdir -p dtc/tests
> python /home/andreas/QEMU/qemu-ppc/scripts/tracetool.py --format=h
> --backend=nop < /home/andreas/QEMU/qemu-ppc/trace-events >
> trace/generated-tracers.h-timestamp
> make -I/home/andreas/QEMU/qemu-ppc/dtc
> VPATH=/home/andreas/QEMU/qemu-ppc/dtc -C dtc V="1"
> LIBFDT_srcdir=/home/andreas/QEMU/qemu-ppc/dtc/libfdt CFLAGS="-O2
> -D_FORTIFY_SOURCE=2 -g  -Werror -fPIE -DPIE -m64 -D_GNU_SOURCE
> -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes
> -Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes
> -fno-strict-aliasing  -Wendif-labels -Wmissing-include-dirs -Wempty-body
> -Wnested-externs -Wformat-security -Wformat-y2k -Winit-self
> -Wignored-qualifiers -Wold-style-declaration -Wold-style-definition
> -Wtype-limits -fstack-protector-all -I/usr/include/libseccomp-1.0.1
> -I/usr/include/libpng15   -I/usr/include/spice-server
> -I/usr/include/pixman-1 -I/usr/include/spice-1   -I/usr/include/pixman-1
>   -I/home/andreas/QEMU/qemu-ppc/dtc/libfdt -pthread
> -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include
> -I/home/andreas/QEMU/qemu-ppc/tests -I/home/andreas/QEMU/build-ppc/dtc
> -I/home/andreas/QEMU/qemu-ppc/dtc
> -I/home/andreas/QEMU/qemu-ppc/dtc/libfdt" LDFLAGS="-Wl,--warn-common
> -Wl,-z,relro -Wl,-z,now -pie -m64 -g " ARFLAGS="" CC="cc" AR="ar"
> LD="ld"  BUILD_DIR=/home/andreas/QEMU/build-ppc libfdt/libfdt.a
> make[1]: Entering directory `/home/andreas/QEMU/build-ppc/dtc'
> cc -I libfdt -MM -MG -MT "tests/trees.o tests/trees.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/trees.S > tests/trees.d
> cc -I libfdt -MM -MG -MT "tests/dumptrees.o tests/dumptrees.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/dumptrees.c > tests/dumptrees.d
> cc -I libfdt -MM -MG -MT "tests/value-labels.o tests/value-labels.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/value-labels.c > tests/value-labels.d
> cc -I libfdt -MM -MG -MT "tests/testutils.o tests/testutils.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/testutils.c > tests/testutils.d
> cc -I libfdt -MM -MG -MT "tests/asm_tree_dump.o tests/asm_tree_dump.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/asm_tree_dump.c >
> tests/asm_tree_dump.d
> cc -I libfdt -MM -MG -MT "tests/truncated_property.o
> tests/truncated_property.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/truncated_property.c >
> tests/truncated_property.d
> cc -I libfdt -MM -MG -MT "tests/add_subnode_with_nops.o
> tests/add_subnode_with_nops.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/add_subnode_with_nops.c >
> tests/add_subnode_with_nops.d
> cc -I libfdt -MM -MG -MT "tests/path_offset_aliases.o
> tests/path_offset_aliases.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/path_offset_aliases.c >
> tests/path_offset_aliases.d
> cc -I libfdt -MM -MG -MT "tests/dtbs_equal_unordered.o
> tests/dtbs_equal_unordered.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/dtbs_equal_unordered.c >
> tests/dtbs_equal_unordered.d
> cc -I libfdt -MM -MG -MT "tests/dtb_reverse.o tests/dtb_reverse.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/dtb_reverse.c > tests/dtb_reverse.d
> cc -I libfdt -MM -MG -MT "tests/dtbs_equal_ordered.o
> tests/dtbs_equal_ordered.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/dtbs_equal_ordered.c >
> tests/dtbs_equal_ordered.d
> cc -I libfdt -MM -MG -MT "tests/extra-terminating-null.o
> tests/extra-terminating-null.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/extra-terminating-null.c >
> tests/extra-terminating-null.d
> cc -I libfdt -MM -MG -MT "tests/incbin.o tests/incbin.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/incbin.c > tests/incbin.d
> cc -I libfdt -MM -MG -MT "tests/boot-cpuid.o tests/boot-cpuid.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/boot-cpuid.c > tests/boot-cpuid.d
> cc -I libfdt -MM -MG -MT "tests/phandle_format.o tests/phandle_format.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/phandle_format.c >
> tests/phandle_format.d
> cc -I libfdt -MM -MG -MT "tests/path-references.o
> tests/path-references.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/path-references.c >
> tests/path-references.d
> cc -I libfdt -MM -MG -MT "tests/references.o tests/references.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/references.c > tests/references.d
> cc -I libfdt -MM -MG -MT "tests/string_escapes.o tests/string_escapes.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/string_escapes.c >
> tests/string_escapes.d
> cc -I libfdt -MM -MG -MT "tests/del_node.o tests/del_node.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/del_node.c > tests/del_node.d
> cc -I libfdt -MM -MG -MT "tests/del_property.o tests/del_property.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/del_property.c > tests/del_property.d
> cc -I libfdt -MM -MG -MT "tests/setprop.o tests/setprop.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/setprop.c > tests/setprop.d
> cc -I libfdt -MM -MG -MT "tests/set_name.o tests/set_name.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/set_name.c > tests/set_name.d
> cc -I libfdt -MM -MG -MT "tests/rw_tree1.o tests/rw_tree1.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/rw_tree1.c > tests/rw_tree1.d
> cc -I libfdt -MM -MG -MT "tests/open_pack.o tests/open_pack.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/open_pack.c > tests/open_pack.d
> cc -I libfdt -MM -MG -MT "tests/nopulate.o tests/nopulate.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/nopulate.c > tests/nopulate.d
> cc -I libfdt -MM -MG -MT "tests/mangle-layout.o tests/mangle-layout.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/mangle-layout.c >
> tests/mangle-layout.d
> cc -I libfdt -MM -MG -MT "tests/move_and_save.o tests/move_and_save.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/move_and_save.c >
> tests/move_and_save.d
> cc -I libfdt -MM -MG -MT "tests/sw_tree1.o tests/sw_tree1.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/sw_tree1.c > tests/sw_tree1.d
> cc -I libfdt -MM -MG -MT "tests/nop_node.o tests/nop_node.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/nop_node.c > tests/nop_node.d
> cc -I libfdt -MM -MG -MT "tests/nop_property.o tests/nop_property.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/nop_property.c > tests/nop_property.d
> cc -I libfdt -MM -MG -MT "tests/setprop_inplace.o
> tests/setprop_inplace.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/setprop_inplace.c >
> tests/setprop_inplace.d
> cc -I libfdt -MM -MG -MT "tests/notfound.o tests/notfound.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/notfound.c > tests/notfound.d
> cc -I libfdt -MM -MG -MT "tests/get_alias.o tests/get_alias.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/get_alias.c > tests/get_alias.d
> cc -I libfdt -MM -MG -MT "tests/node_offset_by_compatible.o
> tests/node_offset_by_compatible.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/node_offset_by_compatible.c >
> tests/node_offset_by_compatible.d
> cc -I libfdt -MM -MG -MT "tests/node_check_compatible.o
> tests/node_check_compatible.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/node_check_compatible.c >
> tests/node_check_compatible.d
> cc -I libfdt -MM -MG -MT "tests/node_offset_by_phandle.o
> tests/node_offset_by_phandle.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/node_offset_by_phandle.c >
> tests/node_offset_by_phandle.d
> cc -I libfdt -MM -MG -MT "tests/node_offset_by_prop_value.o
> tests/node_offset_by_prop_value.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/node_offset_by_prop_value.c >
> tests/node_offset_by_prop_value.d
> cc -I libfdt -MM -MG -MT "tests/parent_offset.o tests/parent_offset.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/parent_offset.c >
> tests/parent_offset.d
> cc -I libfdt -MM -MG -MT "tests/supernode_atdepth_offset.o
> tests/supernode_atdepth_offset.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/supernode_atdepth_offset.c >
> tests/supernode_atdepth_offset.d
> cc -I libfdt -MM -MG -MT "tests/get_path.o tests/get_path.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/get_path.c > tests/get_path.d
> cc -I libfdt -MM -MG -MT "tests/get_phandle.o tests/get_phandle.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/get_phandle.c > tests/get_phandle.d
> cc -I libfdt -MM -MG -MT "tests/getprop.o tests/getprop.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/getprop.c > tests/getprop.d
> cc -I libfdt -MM -MG -MT "tests/get_name.o tests/get_name.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/get_name.c > tests/get_name.d
> cc -I libfdt -MM -MG -MT "tests/path_offset.o tests/path_offset.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/path_offset.c > tests/path_offset.d
> cc -I libfdt -MM -MG -MT "tests/subnode_offset.o tests/subnode_offset.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/subnode_offset.c >
> tests/subnode_offset.d
> cc -I libfdt -MM -MG -MT "tests/find_property.o tests/find_property.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/find_property.c >
> tests/find_property.d
> cc -I libfdt -MM -MG -MT "tests/root_node.o tests/root_node.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/root_node.c > tests/root_node.d
> cc -I libfdt -MM -MG -MT "tests/get_mem_rsv.o tests/get_mem_rsv.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/get_mem_rsv.c > tests/get_mem_rsv.d
> cc -I libfdt -MM -MG -MT "libfdt/fdt_strerror.o libfdt/fdt_strerror.d"
> /home/andreas/QEMU/qemu-ppc/dtc/libfdt/fdt_strerror.c >
> libfdt/fdt_strerror.d
> cc -I libfdt -MM -MG -MT "libfdt/fdt_rw.o libfdt/fdt_rw.d"
> /home/andreas/QEMU/qemu-ppc/dtc/libfdt/fdt_rw.c > libfdt/fdt_rw.d
> cc -I libfdt -MM -MG -MT "libfdt/fdt_sw.o libfdt/fdt_sw.d"
> /home/andreas/QEMU/qemu-ppc/dtc/libfdt/fdt_sw.c > libfdt/fdt_sw.d
> cc -I libfdt -MM -MG -MT "libfdt/fdt_wip.o libfdt/fdt_wip.d"
> /home/andreas/QEMU/qemu-ppc/dtc/libfdt/fdt_wip.c > libfdt/fdt_wip.d
> cc -I libfdt -MM -MG -MT "libfdt/fdt_ro.o libfdt/fdt_ro.d"
> /home/andreas/QEMU/qemu-ppc/dtc/libfdt/fdt_ro.c > libfdt/fdt_ro.d
> cc -I libfdt -MM -MG -MT "libfdt/fdt.o libfdt/fdt.d"
> /home/andreas/QEMU/qemu-ppc/dtc/libfdt/fdt.c > libfdt/fdt.d
> cc -I libfdt -MM -MG -MT "ftdump.o ftdump.d"
> /home/andreas/QEMU/qemu-ppc/dtc/ftdump.c > ftdump.d
> flex -oconvert-dtsv0-lexer.lex.c
> /home/andreas/QEMU/qemu-ppc/dtc/convert-dtsv0-lexer.l
> cc -I libfdt -MM -MG -MT "util.o util.d"
> /home/andreas/QEMU/qemu-ppc/dtc/util.c > util.d
> cc -I libfdt -MM -MG -MT "srcpos.o srcpos.d"
> /home/andreas/QEMU/qemu-ppc/dtc/srcpos.c > srcpos.d
> flex -odtc-lexer.lex.c /home/andreas/QEMU/qemu-ppc/dtc/dtc-lexer.l
> bison -d /home/andreas/QEMU/qemu-ppc/dtc/dtc-parser.y
> cc -I libfdt -MM -MG -MT "treesource.o treesource.d"
> /home/andreas/QEMU/qemu-ppc/dtc/treesource.c > treesource.d
> cc -I libfdt -MM -MG -MT "livetree.o livetree.d"
> /home/andreas/QEMU/qemu-ppc/dtc/livetree.c > livetree.d
> cc -I libfdt -MM -MG -MT "fstree.o fstree.d"
> /home/andreas/QEMU/qemu-ppc/dtc/fstree.c > fstree.d
> cc -I libfdt -MM -MG -MT "flattree.o flattree.d"
> /home/andreas/QEMU/qemu-ppc/dtc/flattree.c > flattree.d
> cc -I libfdt -MM -MG -MT "dtc.o dtc.d"
> /home/andreas/QEMU/qemu-ppc/dtc/dtc.c > dtc.d
> cc -I libfdt -MM -MG -MT "data.o data.d"
> /home/andreas/QEMU/qemu-ppc/dtc/data.c > data.d
> cc -I libfdt -MM -MG -MT "checks.o checks.d"
> /home/andreas/QEMU/qemu-ppc/dtc/checks.c > checks.d
> cc -I libfdt -MM -MG -MT "convert-dtsv0-lexer.lex.o
> convert-dtsv0-lexer.lex.d" convert-dtsv0-lexer.lex.c >
> convert-dtsv0-lexer.lex.d
> cc -I libfdt -MM -MG -MT "dtc-parser.tab.o dtc-parser.tab.d"
> dtc-parser.tab.c > dtc-parser.tab.d
> cc -I libfdt -MM -MG -MT "dtc-lexer.lex.o dtc-lexer.lex.d"
> dtc-lexer.lex.c > dtc-lexer.lex.d
> make[1]: Leaving directory `/home/andreas/QEMU/build-ppc/dtc'
> make[1]: Entering directory `/home/andreas/QEMU/build-ppc/dtc'
> set -e; echo '  CHK version_gen.h'; mkdir -p ./;        (echo "#define
> DTC_VERSION \"DTC 1.3.0\""; ) < Makefile > version_gen.h.tmp; if [ -r
> version_gen.h ] && cmp -s version_gen.h version_gen.h.tmp; then rm -f
> version_gen.h.tmp; else echo '  UPD version_gen.h'; mv -f
> version_gen.h.tmp version_gen.h; fi;
>         CHK version_gen.h
>         UPD version_gen.h
> cc -I libfdt -MM -MG -MT "dtc.o dtc.d"
> /home/andreas/QEMU/qemu-ppc/dtc/dtc.c > dtc.d
> make[1]: Leaving directory `/home/andreas/QEMU/build-ppc/dtc'
> make[1]: Entering directory `/home/andreas/QEMU/build-ppc/dtc'
> set -e; echo '  CHK version_gen.h'; mkdir -p ./;        (echo "#define
> DTC_VERSION \"DTC 1.3.0\""; ) < Makefile > version_gen.h.tmp; if [ -r
> version_gen.h ] && cmp -s version_gen.h version_gen.h.tmp; then rm -f
> version_gen.h.tmp; else echo '  UPD version_gen.h'; mv -f
> version_gen.h.tmp version_gen.h; fi;
>         CHK version_gen.h
> cc -I libfdt -O2 -D_FORTIFY_SOURCE=2 -g  -Werror -fPIE -DPIE -m64
> -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
> -Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings
> -Wmissing-prototypes -fno-strict-aliasing  -Wendif-labels
> -Wmissing-include-dirs -Wempty-body -Wnested-externs -Wformat-security
> -Wformat-y2k -Winit-self -Wignored-qualifiers -Wold-style-declaration
> -Wold-style-definition -Wtype-limits -fstack-protector-all
> -I/usr/include/libseccomp-1.0.1   -I/usr/include/libpng15
> -I/usr/include/spice-server -I/usr/include/pixman-1
> -I/usr/include/spice-1   -I/usr/include/pixman-1
> -I/home/andreas/QEMU/qemu-ppc/dtc/libfdt -pthread
> -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include
> -I/home/andreas/QEMU/qemu-ppc/tests -I/home/andreas/QEMU/build-ppc/dtc
> -I/home/andreas/QEMU/qemu-ppc/dtc
> -I/home/andreas/QEMU/qemu-ppc/dtc/libfdt -o libfdt/fdt_ro.o -c
> /home/andreas/QEMU/qemu-ppc/dtc/libfdt/fdt_ro.c
> cc -I libfdt -O2 -D_FORTIFY_SOURCE=2 -g  -Werror -fPIE -DPIE -m64
> -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
> -Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings
> -Wmissing-prototypes -fno-strict-aliasing  -Wendif-labels
> -Wmissing-include-dirs -Wempty-body -Wnested-externs -Wformat-security
> -Wformat-y2k -Winit-self -Wignored-qualifiers -Wold-style-declaration
> -Wold-style-definition -Wtype-limits -fstack-protector-all
> -I/usr/include/libseccomp-1.0.1   -I/usr/include/libpng15
> -I/usr/include/spice-server -I/usr/include/pixman-1
> -I/usr/include/spice-1   -I/usr/include/pixman-1
> -I/home/andreas/QEMU/qemu-ppc/dtc/libfdt -pthread
> -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include
> -I/home/andreas/QEMU/qemu-ppc/tests -I/home/andreas/QEMU/build-ppc/dtc
> -I/home/andreas/QEMU/qemu-ppc/dtc
> -I/home/andreas/QEMU/qemu-ppc/dtc/libfdt -o libfdt/fdt.o -c
> /home/andreas/QEMU/qemu-ppc/dtc/libfdt/fdt.c
> cc -I libfdt -O2 -D_FORTIFY_SOURCE=2 -g  -Werror -fPIE -DPIE -m64
> -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
> -Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings
> -Wmissing-prototypes -fno-strict-aliasing  -Wendif-labels
> -Wmissing-include-dirs -Wempty-body -Wnested-externs -Wformat-security
> -Wformat-y2k -Winit-self -Wignored-qualifiers -Wold-style-declaration
> -Wold-style-definition -Wtype-limits -fstack-protector-all
> -I/usr/include/libseccomp-1.0.1   -I/usr/include/libpng15
> -I/usr/include/spice-server -I/usr/include/pixman-1
> -I/usr/include/spice-1   -I/usr/include/pixman-1
> -I/home/andreas/QEMU/qemu-ppc/dtc/libfdt -pthread
> -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include
> -I/home/andreas/QEMU/qemu-ppc/tests -I/home/andreas/QEMU/build-ppc/dtc
> -I/home/andreas/QEMU/qemu-ppc/dtc
> -I/home/andreas/QEMU/qemu-ppc/dtc/libfdt -o libfdt/fdt_wip.o -c
> /home/andreas/QEMU/qemu-ppc/dtc/libfdt/fdt_wip.c
> cc -I libfdt -O2 -D_FORTIFY_SOURCE=2 -g  -Werror -fPIE -DPIE -m64
> -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
> -Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings
> -Wmissing-prototypes -fno-strict-aliasing  -Wendif-labels
> -Wmissing-include-dirs -Wempty-body -Wnested-externs -Wformat-security
> -Wformat-y2k -Winit-self -Wignored-qualifiers -Wold-style-declaration
> -Wold-style-definition -Wtype-limits -fstack-protector-all
> -I/usr/include/libseccomp-1.0.1   -I/usr/include/libpng15
> -I/usr/include/spice-server -I/usr/include/pixman-1
> -I/usr/include/spice-1   -I/usr/include/pixman-1
> -I/home/andreas/QEMU/qemu-ppc/dtc/libfdt -pthread
> -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include
> -I/home/andreas/QEMU/qemu-ppc/tests -I/home/andreas/QEMU/build-ppc/dtc
> -I/home/andreas/QEMU/qemu-ppc/dtc
> -I/home/andreas/QEMU/qemu-ppc/dtc/libfdt -o libfdt/fdt_sw.o -c
> /home/andreas/QEMU/qemu-ppc/dtc/libfdt/fdt_sw.c
> cc -I libfdt -O2 -D_FORTIFY_SOURCE=2 -g  -Werror -fPIE -DPIE -m64
> -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
> -Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings
> -Wmissing-prototypes -fno-strict-aliasing  -Wendif-labels
> -Wmissing-include-dirs -Wempty-body -Wnested-externs -Wformat-security
> -Wformat-y2k -Winit-self -Wignored-qualifiers -Wold-style-declaration
> -Wold-style-definition -Wtype-limits -fstack-protector-all
> -I/usr/include/libseccomp-1.0.1   -I/usr/include/libpng15
> -I/usr/include/spice-server -I/usr/include/pixman-1
> -I/usr/include/spice-1   -I/usr/include/pixman-1
> -I/home/andreas/QEMU/qemu-ppc/dtc/libfdt -pthread
> -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include
> -I/home/andreas/QEMU/qemu-ppc/tests -I/home/andreas/QEMU/build-ppc/dtc
> -I/home/andreas/QEMU/qemu-ppc/dtc
> -I/home/andreas/QEMU/qemu-ppc/dtc/libfdt -o libfdt/fdt_rw.o -c
> /home/andreas/QEMU/qemu-ppc/dtc/libfdt/fdt_rw.c
> cc -I libfdt -O2 -D_FORTIFY_SOURCE=2 -g  -Werror -fPIE -DPIE -m64
> -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
> -Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings
> -Wmissing-prototypes -fno-strict-aliasing  -Wendif-labels
> -Wmissing-include-dirs -Wempty-body -Wnested-externs -Wformat-security
> -Wformat-y2k -Winit-self -Wignored-qualifiers -Wold-style-declaration
> -Wold-style-definition -Wtype-limits -fstack-protector-all
> -I/usr/include/libseccomp-1.0.1   -I/usr/include/libpng15
> -I/usr/include/spice-server -I/usr/include/pixman-1
> -I/usr/include/spice-1   -I/usr/include/pixman-1
> -I/home/andreas/QEMU/qemu-ppc/dtc/libfdt -pthread
> -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include
> -I/home/andreas/QEMU/qemu-ppc/tests -I/home/andreas/QEMU/build-ppc/dtc
> -I/home/andreas/QEMU/qemu-ppc/dtc
> -I/home/andreas/QEMU/qemu-ppc/dtc/libfdt -o libfdt/fdt_strerror.o -c
> /home/andreas/QEMU/qemu-ppc/dtc/libfdt/fdt_strerror.c
> ar  libfdt/libfdt.a libfdt/fdt.o libfdt/fdt_ro.o libfdt/fdt_wip.o
> libfdt/fdt_sw.o libfdt/fdt_rw.o libfdt/fdt_strerror.o
> ar: two different operation options specified
> make[1]: *** [libfdt/libfdt.a] Fehler 1
> make[1]: Leaving directory `/home/andreas/QEMU/build-ppc/dtc'
> make: *** [subdir-dtc] Fehler 2
>
> Andreas
>
> --
> SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
> GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
>

Re: [Qemu-devel] [PULL 06/10] configure: dtc: Probe for libfdt_env.h

[Andreas Färber]

Am 18.06.2013 02:52, schrieb Peter Crosthwaite:
> On Tue, Jun 18, 2013 at 10:46 AM, Andreas Färber <afaerber@suse.de> wrote:
>> Am 18.06.2013 01:44, schrieb Peter Maydell:
>>> On 18 June 2013 00:24, Andreas Färber <afaerber@suse.de> wrote:
>>>> As far as I can see, 1.3.0 is the latest available stable dtc version,
>>>> and it doesn't install libfdt_env.h yet apparently. Any chance we can
>>>> restore build with dtc 1.3.0 tarball (it used to work fine) while
>>>> keeping newer versions working?
>>>
>>> I wanted to keep things simple, ie just require a distro
>>> version of libfdt to be installed the way upstream say it
>>> should be, rather than second-guessing whether a broken
>>> libfdt is or isn't going to work with our libfdt_env.h.
>>
>> Quote: "(1) Preferred: Install the DTC devel package"
>>
>> Just to clarify: I am pointing out that apparently there is *no* stable
>> version 1.4.0 or 1.3.1 that installs the expected libfdt_env.h:
>>
>> http://git.jdl.com/gitweb/?p=dtc.git;a=tags
>>
>> And I believe a request to package a random git commit for openSUSE
>> distro is going to be declined.
>>
>> So I would be perfectly happy if the dtc maintainers were to provide an
>> official tarball that I can get into our distribution. Then we don't
>> need to tweak QEMU's configure at all. :)
>>
> 
> Yes, this is massively overdue. Bugfixes aside DTC has seen some
> significant feature development since 1.3.0.

For the record, I came up with the following interim fix for openSUSE to
avoid submodule builds for all my repositories:

https://build.opensuse.org/request/show/179370

Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Re: [Qemu-devel] [PULL 06/10] configure: dtc: Probe for libfdt_env.h

[Paolo Bonzini]

Il 18/06/2013 03:22, Andreas Färber ha scritto:
>> Yes, this is massively overdue. Bugfixes aside DTC has seen some
>> significant feature development since 1.3.0.
> 
> For the record, I came up with the following interim fix for openSUSE to
> avoid submodule builds for all my repositories:
> 
> https://build.opensuse.org/request/show/179370

I did something similar with EPEL.  However, note that it may break
building old QEMU if QEMU's libfdt_env.h is picked up instead of the
installed one.  :(

Paolo

Re: [Qemu-devel] [PULL 06/10] configure: dtc: Probe for libfdt_env.h

[Peter Maydell]

On 18 June 2013 01:46, Andreas Färber <afaerber@suse.de> wrote:
> $ make -j6 V=1

> make -I/home/andreas/QEMU/qemu-ppc/dtc
> VPATH=/home/andreas/QEMU/qemu-ppc/dtc -C dtc V="1"
> LIBFDT_srcdir=/home/andreas/QEMU/qemu-ppc/dtc/libfdt CFLAGS="-O2
> -D_FORTIFY_SOURCE=2 -g  -Werror -fPIE -DPIE -m64 -D_GNU_SOURCE
> -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes
> -Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes
> -fno-strict-aliasing  -Wendif-labels -Wmissing-include-dirs -Wempty-body
> -Wnested-externs -Wformat-security -Wformat-y2k -Winit-self
> -Wignored-qualifiers -Wold-style-declaration -Wold-style-definition
> -Wtype-limits -fstack-protector-all -I/usr/include/libseccomp-1.0.1
> -I/usr/include/libpng15   -I/usr/include/spice-server
> -I/usr/include/pixman-1 -I/usr/include/spice-1   -I/usr/include/pixman-1
>   -I/home/andreas/QEMU/qemu-ppc/dtc/libfdt -pthread
> -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include
> -I/home/andreas/QEMU/qemu-ppc/tests -I/home/andreas/QEMU/build-ppc/dtc
> -I/home/andreas/QEMU/qemu-ppc/dtc
> -I/home/andreas/QEMU/qemu-ppc/dtc/libfdt" LDFLAGS="-Wl,--warn-common
> -Wl,-z,relro -Wl,-z,now -pie -m64 -g " ARFLAGS="" CC="cc" AR="ar"
> LD="ld"  BUILD_DIR=/home/andreas/QEMU/build-ppc libfdt/libfdt.a

...so we tell the libfdt makefile to build libfdt.a...

> make[1]: Entering directory `/home/andreas/QEMU/build-ppc/dtc'
> cc -I libfdt -MM -MG -MT "tests/trees.o tests/trees.d"
> /home/andreas/QEMU/qemu-ppc/dtc/tests/trees.S > tests/trees.d
> cc -I libfdt -MM -MG -MT "tests/dumptrees.o tests/dumptrees.d"

...and it starts to build its test suite?! This doesn't happen
for me. What git commit is your dtc submodule at, please?

However, it's not the cause of the problem:

> ar  libfdt/libfdt.a libfdt/fdt.o libfdt/fdt_ro.o libfdt/fdt_wip.o
> libfdt/fdt_sw.o libfdt/fdt_rw.o libfdt/fdt_strerror.o
> ar: two different operation options specified

...which is that the top level makefile is passing ARFLAGS=""
and so we don't specify any operation to ar at all. For me
the submake is invoked with ARFLAGS ="rv" (which is Make's
default for when ARFLAGS wasn't specified).

QEMU's configure and makefile don't fiddle with ARFLAGS at all:
are you passing some odd values in from your environment?

thanks
-- PMM

Re: [Qemu-devel] [PULL 06/10] configure: dtc: Probe for libfdt_env.h

[Cole Robinson]

CCing qemu-stable. We want this for Fedora 19 at least where updated dtc broke
our build.

- Cole

On 06/14/2013 10:53 AM, Peter Maydell wrote:
> From: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
> 
> Currently QEMU provides a local clone of the file libfdt_env.h in
> /include. This file is supposed to come with the libfdt package and is
> only needed for broken installs of libfdt. Now that we have submodule
> dtc, just ignore these broken installs and prompt for the dtc submodule
> install instead. QEMU's local libfdt_env.h is removed accordingly.
> 
> Manifests as a bug when building QEMU with modern libfdt. The new
> version of libfdt does not compile when QEMUs libfdt_env.h takes
> precedence over the hosts.
> 
> Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
> Acked-by: David Gibson <david@gibson.dropbear.id.au>
> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
> Acked-by: Paolo Bonzini <pbonzini@redhat.com>
> Message-id: 9b6a3a52e3f46cfbc1ded9ab56385ec045e46705.1369628289.git.peter.crosthwaite@xilinx.com
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>  configure            |    2 ++
>  include/libfdt_env.h |   36 ------------------------------------
>  2 files changed, 2 insertions(+), 36 deletions(-)
>  delete mode 100644 include/libfdt_env.h
> 
> diff --git a/configure b/configure
> index 8732185..31b7783 100755
> --- a/configure
> +++ b/configure
> @@ -2488,7 +2488,9 @@ fi
>  # fdt probe
>  if test "$fdt" != "no" ; then
>    fdt_libs="-lfdt"
> +  # explicitly check for libfdt_env.h as it is missing in some stable installs
>    cat > $TMPC << EOF
> +#include <libfdt_env.h>
>  int main(void) { return 0; }
>  EOF
>    if compile_prog "" "$fdt_libs" ; then
> diff --git a/include/libfdt_env.h b/include/libfdt_env.h
> deleted file mode 100644
> index 3667d4c..0000000
> --- a/include/libfdt_env.h
> +++ /dev/null
> @@ -1,36 +0,0 @@
> -/*
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License, version 2, as
> - * published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
> - *
> - * You should have received a copy of the GNU General Public License
> - * along with this program; if not, see <http://www.gnu.org/licenses/>.
> - *
> - * Copyright IBM Corp. 2008
> - * Authors: Hollis Blanchard <hollisb@us.ibm.com>
> - *
> - */
> -
> -#ifndef _LIBFDT_ENV_H
> -#define _LIBFDT_ENV_H
> -
> -#include "qemu/bswap.h"
> -
> -#ifdef HOST_WORDS_BIGENDIAN
> -#define fdt32_to_cpu(x)  (x)
> -#define cpu_to_fdt32(x)  (x)
> -#define fdt64_to_cpu(x)  (x)
> -#define cpu_to_fdt64(x)  (x)
> -#else
> -#define fdt32_to_cpu(x)  bswap32(x)
> -#define cpu_to_fdt32(x)  bswap32(x)
> -#define fdt64_to_cpu(x)  bswap64(x)
> -#define cpu_to_fdt64(x)  bswap64(x)
> -#endif
> -
> -#endif /* _LIBFDT_ENV_H */
> 

Re: [Qemu-devel] [PULL 06/10] configure: dtc: Probe for libfdt_env.h

[Peter Maydell]

IIRC Paolo's ack on this patch came with a caveat of "if it is
not for -stable" -- cc'ing him.

thanks
-- PMM

On 19 June 2013 15:48, Cole Robinson <crobinso@redhat.com> wrote:
> CCing qemu-stable. We want this for Fedora 19 at least where updated dtc broke
> our build.
>
> - Cole
>
> On 06/14/2013 10:53 AM, Peter Maydell wrote:
>> From: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
>>
>> Currently QEMU provides a local clone of the file libfdt_env.h in
>> /include. This file is supposed to come with the libfdt package and is
>> only needed for broken installs of libfdt. Now that we have submodule
>> dtc, just ignore these broken installs and prompt for the dtc submodule
>> install instead. QEMU's local libfdt_env.h is removed accordingly.
>>
>> Manifests as a bug when building QEMU with modern libfdt. The new
>> version of libfdt does not compile when QEMUs libfdt_env.h takes
>> precedence over the hosts.
>>
>> Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
>> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
>> Acked-by: David Gibson <david@gibson.dropbear.id.au>
>> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
>> Acked-by: Paolo Bonzini <pbonzini@redhat.com>
>> Message-id: 9b6a3a52e3f46cfbc1ded9ab56385ec045e46705.1369628289.git.peter.crosthwaite@xilinx.com
>> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
>> ---
>>  configure            |    2 ++
>>  include/libfdt_env.h |   36 ------------------------------------
>>  2 files changed, 2 insertions(+), 36 deletions(-)
>>  delete mode 100644 include/libfdt_env.h
>>
>> diff --git a/configure b/configure
>> index 8732185..31b7783 100755
>> --- a/configure
>> +++ b/configure
>> @@ -2488,7 +2488,9 @@ fi
>>  # fdt probe
>>  if test "$fdt" != "no" ; then
>>    fdt_libs="-lfdt"
>> +  # explicitly check for libfdt_env.h as it is missing in some stable installs
>>    cat > $TMPC << EOF
>> +#include <libfdt_env.h>
>>  int main(void) { return 0; }
>>  EOF
>>    if compile_prog "" "$fdt_libs" ; then
>> diff --git a/include/libfdt_env.h b/include/libfdt_env.h
>> deleted file mode 100644
>> index 3667d4c..0000000
>> --- a/include/libfdt_env.h
>> +++ /dev/null
>> @@ -1,36 +0,0 @@
>> -/*
>> - * This program is free software; you can redistribute it and/or modify
>> - * it under the terms of the GNU General Public License, version 2, as
>> - * published by the Free Software Foundation.
>> - *
>> - * This program is distributed in the hope that it will be useful,
>> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>> - * GNU General Public License for more details.
>> - *
>> - * You should have received a copy of the GNU General Public License
>> - * along with this program; if not, see <http://www.gnu.org/licenses/>.
>> - *
>> - * Copyright IBM Corp. 2008
>> - * Authors: Hollis Blanchard <hollisb@us.ibm.com>
>> - *
>> - */
>> -
>> -#ifndef _LIBFDT_ENV_H
>> -#define _LIBFDT_ENV_H
>> -
>> -#include "qemu/bswap.h"
>> -
>> -#ifdef HOST_WORDS_BIGENDIAN
>> -#define fdt32_to_cpu(x)  (x)
>> -#define cpu_to_fdt32(x)  (x)
>> -#define fdt64_to_cpu(x)  (x)
>> -#define cpu_to_fdt64(x)  (x)
>> -#else
>> -#define fdt32_to_cpu(x)  bswap32(x)
>> -#define cpu_to_fdt32(x)  bswap32(x)
>> -#define fdt64_to_cpu(x)  bswap64(x)
>> -#define cpu_to_fdt64(x)  bswap64(x)
>> -#endif
>> -
>> -#endif /* _LIBFDT_ENV_H */
>>
>

[Qemu-devel] [PULL 07/10] configure: Require libfdt for arm, ppc, microblaze softmmu targets

[Peter Maydell]

A number of our softmmu targets (PPC, ARM, Microblaze) now more or
less require flattened device tree support for various board models
to work correctly.  Make libfdt mandatory if the target list includes
these, rather than building unhelpful half-functional binaries.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Tested-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Message-id: 1369409217-7553-2-git-send-email-peter.maydell@linaro.org
---
 configure |   20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/configure b/configure
index 31b7783..ad32f87 100755
--- a/configure
+++ b/configure
@@ -2486,6 +2486,26 @@ fi
 
 ##########################################
 # fdt probe
+# fdt support is mandatory for at least some target architectures,
+# so insist on it if we're building those system emulators.
+fdt_required=no
+for target in $target_list; do
+  case $target in
+    arm*-softmmu|ppc*-softmmu|microblaze*-softmmu)
+      fdt_required=yes
+    ;;
+  esac
+done
+
+if test "$fdt_required" = "yes"; then
+  if test "$fdt" = "no"; then
+    error_exit "fdt disabled but some requested targets require it." \
+      "You can turn off fdt only if you also disable all the system emulation" \
+      "targets which need it (by specifying a cut down --target-list)."
+  fi
+  fdt=yes
+fi
+
 if test "$fdt" != "no" ; then
   fdt_libs="-lfdt"
   # explicitly check for libfdt_env.h as it is missing in some stable installs
-- 
1.7.9.5

[Qemu-devel] [PULL 08/10] arm: Remove CONFIG_FDT conditionals

[Peter Maydell]

Now that we know we're compiling with libfdt, we can remove the
CONFIG_FDT conditionals.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Tested-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Message-id: 1369409217-7553-3-git-send-email-peter.maydell@linaro.org
---
 hw/arm/boot.c |    7 -------
 1 file changed, 7 deletions(-)

diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index f451529..defcf15 100644
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -227,7 +227,6 @@ static void set_kernel_args_old(const struct arm_boot_info *info)
 
 static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo)
 {
-#ifdef CONFIG_FDT
     uint32_t *mem_reg_property;
     uint32_t mem_reg_propsize;
     void *fdt = NULL;
@@ -308,12 +307,6 @@ static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo)
     cpu_physical_memory_write(addr, fdt, size);
 
     return 0;
-
-#else
-    fprintf(stderr, "Device tree requested, "
-                "but qemu was compiled without fdt support\n");
-    return -1;
-#endif
 }
 
 static void do_cpu_reset(void *opaque)
-- 
1.7.9.5

[Qemu-devel] [PULL 09/10] microblaze: Remove CONFIG_FDT conditionals

[Peter Maydell]

Now that we know we're compiling with libfdt we can remove the
CONFIG_FDT conditionals.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Tested-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Message-id: 1369409217-7553-4-git-send-email-peter.maydell@linaro.org
---
 hw/microblaze/boot.c |   12 ------------
 1 file changed, 12 deletions(-)

diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c
index e543d88..3f1d70e 100644
--- a/hw/microblaze/boot.c
+++ b/hw/microblaze/boot.c
@@ -61,7 +61,6 @@ static int microblaze_load_dtb(hwaddr addr,
                                       const char *dtb_filename)
 {
     int fdt_size;
-#ifdef CONFIG_FDT
     void *fdt = NULL;
     int r;
 
@@ -81,17 +80,6 @@ static int microblaze_load_dtb(hwaddr addr,
     }
 
     cpu_physical_memory_write(addr, fdt, fdt_size);
-#else
-    /* We lack libfdt so we cannot manipulate the fdt. Just pass on the blob
-       to the kernel.  */
-    if (dtb_filename) {
-        fdt_size = load_image_targphys(dtb_filename, addr, 0x10000);
-    }
-    if (kernel_cmdline) {
-        fprintf(stderr,
-                "Warning: missing libfdt, cannot pass cmdline to kernel!\n");
-    }
-#endif
     return fdt_size;
 }
 
-- 
1.7.9.5

[Qemu-devel] [PULL 10/10] ppc: Remove CONFIG_FDT conditionals

[Peter Maydell]

Now that we know we're compiling with libfdt we can remove the
CONFIG_FDT conditionals.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Tested-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Message-id: 1369409217-7553-5-git-send-email-peter.maydell@linaro.org
---
 default-configs/ppc-softmmu.mak    |    2 +-
 default-configs/ppc64-softmmu.mak  |    4 ++--
 default-configs/ppcemb-softmmu.mak |    2 +-
 hw/ppc/ppc440_bamboo.c             |    2 --
 hw/ppc/spapr_vio.c                 |    6 ------
 hw/ppc/virtex_ml507.c              |   18 ------------------
 6 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index cc3587f..bcaa52f 100644
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -42,6 +42,6 @@ CONFIG_I8259=y
 CONFIG_XILINX=y
 CONFIG_XILINX_ETHLITE=y
 CONFIG_OPENPIC=y
-CONFIG_E500=$(CONFIG_FDT)
+CONFIG_E500=y
 # For PReP
 CONFIG_MC146818RTC=y
diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
index 884ea8a..8b7874e 100644
--- a/default-configs/ppc64-softmmu.mak
+++ b/default-configs/ppc64-softmmu.mak
@@ -42,8 +42,8 @@ CONFIG_I8259=y
 CONFIG_XILINX=y
 CONFIG_XILINX_ETHLITE=y
 CONFIG_OPENPIC=y
-CONFIG_PSERIES=$(CONFIG_FDT)
-CONFIG_E500=$(CONFIG_FDT)
+CONFIG_PSERIES=y
+CONFIG_E500=y
 # For pSeries
 CONFIG_PCI_HOTPLUG=y
 # For PReP
diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak
index be93e03..61920ff 100644
--- a/default-configs/ppcemb-softmmu.mak
+++ b/default-configs/ppcemb-softmmu.mak
@@ -37,6 +37,6 @@ CONFIG_I8259=y
 CONFIG_XILINX=y
 CONFIG_XILINX_ETHLITE=y
 CONFIG_OPENPIC=y
-CONFIG_E500=$(CONFIG_FDT)
+CONFIG_E500=y
 # For PReP
 CONFIG_MC146818RTC=y
diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
index a55e717..b0c1c02 100644
--- a/hw/ppc/ppc440_bamboo.c
+++ b/hw/ppc/ppc440_bamboo.c
@@ -58,7 +58,6 @@ static int bamboo_load_device_tree(hwaddr addr,
                                      const char *kernel_cmdline)
 {
     int ret = -1;
-#ifdef CONFIG_FDT
     uint32_t mem_reg_property[] = { 0, 0, cpu_to_be32(ramsize) };
     char *filename;
     int fdt_size;
@@ -115,7 +114,6 @@ static int bamboo_load_device_tree(hwaddr addr,
     g_free(fdt);
 
 out:
-#endif
 
     return ret;
 }
diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c
index 1405c32..304f316 100644
--- a/hw/ppc/spapr_vio.c
+++ b/hw/ppc/spapr_vio.c
@@ -34,9 +34,7 @@
 #include "hw/ppc/spapr_vio.h"
 #include "hw/ppc/xics.h"
 
-#ifdef CONFIG_FDT
 #include <libfdt.h>
-#endif /* CONFIG_FDT */
 
 /* #define DEBUG_SPAPR */
 
@@ -94,7 +92,6 @@ VIOsPAPRDevice *spapr_vio_find_by_reg(VIOsPAPRBus *bus, uint32_t reg)
     return NULL;
 }
 
-#ifdef CONFIG_FDT
 static int vio_make_devnode(VIOsPAPRDevice *dev,
                             void *fdt)
 {
@@ -159,7 +156,6 @@ static int vio_make_devnode(VIOsPAPRDevice *dev,
 
     return node_off;
 }
-#endif /* CONFIG_FDT */
 
 /*
  * CRQ handling
@@ -570,7 +566,6 @@ static void spapr_vio_register_types(void)
 
 type_init(spapr_vio_register_types)
 
-#ifdef CONFIG_FDT
 static int compare_reg(const void *p1, const void *p2)
 {
     VIOsPAPRDevice const *dev1, *dev2;
@@ -655,4 +650,3 @@ int spapr_populate_chosen_stdout(void *fdt, VIOsPAPRBus *bus)
 
     return ret;
 }
-#endif /* CONFIG_FDT */
diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
index 1b4ce76..709a707 100644
--- a/hw/ppc/virtex_ml507.c
+++ b/hw/ppc/virtex_ml507.c
@@ -141,7 +141,6 @@ static int xilinx_load_device_tree(hwaddr addr,
 {
     char *path;
     int fdt_size;
-#ifdef CONFIG_FDT
     void *fdt;
     int r;
 
@@ -162,23 +161,6 @@ static int xilinx_load_device_tree(hwaddr addr,
     if (r < 0)
         fprintf(stderr, "couldn't set /chosen/bootargs\n");
     cpu_physical_memory_write(addr, fdt, fdt_size);
-#else
-    /* We lack libfdt so we cannot manipulate the fdt. Just pass on the blob
-       to the kernel.  */
-    fdt_size = load_image_targphys("ppc.dtb", addr, 0x10000);
-    if (fdt_size < 0) {
-        path = qemu_find_file(QEMU_FILE_TYPE_BIOS, BINARY_DEVICE_TREE_FILE);
-        if (path) {
-            fdt_size = load_image_targphys(path, addr, 0x10000);
-            g_free(path);
-        }
-    }
-
-    if (kernel_cmdline) {
-        fprintf(stderr,
-                "Warning: missing libfdt, cannot pass cmdline to kernel!\n");
-    }
-#endif
     return fdt_size;
 }
 
-- 
1.7.9.5

Re: [Qemu-devel] [PULL 00/10] configury queue

[Paolo Bonzini]

Il 14/06/2013 10:53, Peter Maydell ha scritto:
> [NB: I don't know if we get enough build-machinery patches to make
> it worth having a permanent subtree/submaintainer for them; it's
> merely that at the moment there are enough patches I personally
> care about that I felt like curating them ;-)]

I think that's exactly the right thing to do.  Thanks for sending the
pull request.

Paolo

Re: [Qemu-devel] [PULL 00/10] configury queue

[Anthony Liguori]

Pulled.  Thanks.

Regards,

Anthony Liguori