cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
9ae3a8
From 72b1305cb8cbcd0847a435326c7fa90273ac9c56 Mon Sep 17 00:00:00 2001
9ae3a8
From: Miroslav Rezanina <mrezanin@redhat.com>
9ae3a8
Date: Tue, 2 Jun 2015 13:21:50 +0200
9ae3a8
Subject: [PATCH 3/8] configure: Require libfdt for arm, ppc, microblaze
9ae3a8
 softmmu targets
9ae3a8
9ae3a8
Message-id: <e24e27b010c3f7c0e6a087004f341ec9ffd73a2c.1433250807.git.mrezanin@redhat.com>
9ae3a8
Patchwork-id: 65305
9ae3a8
O-Subject: [RHEL-7.2 qemu-kvm PATCH 1/4] configure: Require libfdt for arm, ppc, microblaze softmmu targets
9ae3a8
Bugzilla: 1217850
9ae3a8
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
9ae3a8
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
9ae3a8
RH-Acked-by: Wei Huang <wei@redhat.com>
9ae3a8
RH-Acked-by: Jeff Nelson <jenelson@redhat.com>
9ae3a8
9ae3a8
From: Peter Maydell <peter.maydell@linaro.org>
9ae3a8
9ae3a8
A number of our softmmu targets (PPC, ARM, Microblaze) now more or
9ae3a8
less require flattened device tree support for various board models
9ae3a8
to work correctly.  Make libfdt mandatory if the target list includes
9ae3a8
these, rather than building unhelpful half-functional binaries.
9ae3a8
9ae3a8
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
9ae3a8
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
9ae3a8
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
9ae3a8
Tested-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
9ae3a8
Message-id: 1369409217-7553-2-git-send-email-peter.maydell@linaro.org
9ae3a8
(cherry-picked from e169e1e1ae1e75c522f932554890fb0f2f3e9999)
9ae3a8
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
9ae3a8
9ae3a8
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
9ae3a8
---
9ae3a8
 configure | 20 ++++++++++++++++++++
9ae3a8
 1 file changed, 20 insertions(+)
9ae3a8
9ae3a8
diff --git a/configure b/configure
9ae3a8
index 1583359..4f63345 100755
9ae3a8
--- a/configure
9ae3a8
+++ b/configure
9ae3a8
@@ -2645,6 +2645,26 @@ fi
9ae3a8
 
9ae3a8
 ##########################################
9ae3a8
 # fdt probe
9ae3a8
+# fdt support is mandatory for at least some target architectures,
9ae3a8
+# so insist on it if we're building those system emulators.
9ae3a8
+fdt_required=no
9ae3a8
+for target in $target_list; do
9ae3a8
+  case $target in
9ae3a8
+    arm*-softmmu|ppc*-softmmu|microblaze*-softmmu)
9ae3a8
+      fdt_required=yes
9ae3a8
+    ;;
9ae3a8
+  esac
9ae3a8
+done
9ae3a8
+
9ae3a8
+if test "$fdt_required" = "yes"; then
9ae3a8
+  if test "$fdt" = "no"; then
9ae3a8
+    error_exit "fdt disabled but some requested targets require it." \
9ae3a8
+      "You can turn off fdt only if you also disable all the system emulation" \
9ae3a8
+      "targets which need it (by specifying a cut down --target-list)."
9ae3a8
+  fi
9ae3a8
+  fdt=yes
9ae3a8
+fi
9ae3a8
+
9ae3a8
 if test "$fdt" != "no" ; then
9ae3a8
   fdt_libs="-lfdt"
9ae3a8
   cat > $TMPC << EOF
9ae3a8
-- 
9ae3a8
1.8.3.1
9ae3a8