[xen staging] Revert "tools: disable building qemu-trad per default"

[patchbot@xxxxxxx]

commit f6507f1a11cb91f527c7ffdffb8e35289a58d0f5
Author:     Ian Jackson <iwj@xxxxxxxxxxxxxx>
AuthorDate: Wed Nov 3 15:20:02 2021 +0000
Commit:     Ian Jackson <iwj@xxxxxxxxxxxxxx>
CommitDate: Wed Nov 3 15:20:41 2021 +0000

    Revert "tools: disable building qemu-trad per default"
    
    Unfortunately this breaks the gitlab CI.  See mails on-list.
    
    This reverts commit ce309942c791628ff42082d1b74bfaeaa5267ae0.
---
 CHANGELOG.md         |  3 ---
 stubdom/configure    |  8 ++++++++
 stubdom/configure.ac |  8 +++++++-
 tools/configure      | 17 +++++++++++++++--
 tools/configure.ac   | 13 ++++++++++++-
 5 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5ab49e779..e7107ac3de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,9 +18,6 @@ The format is based on [Keep a 
Changelog](https://keepachangelog.com/en/1.0.0/)
    or by passing "iommu=quarantine=scratch-page" on the hypervisor command 
line.
  - pv-grub stubdoms will no longer be built per default. In order to be able 
to use pv-grub
    configure needs to be called with "--enable-pv-grub" as parameter.
- - qemu-traditional based device models (both, qemu-traditional and 
ioemu-stubdom) will
-   no longer be built per default. In order to be able to use those, configure 
needs to
-   be called with "--enable-qemu-traditional" as parameter.
 
 ## [4.15.0 
UNRELEASED](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.15.0)
 - TBD
 
diff --git a/stubdom/configure b/stubdom/configure
index 07b709f998..df31532abb 100755
--- a/stubdom/configure
+++ b/stubdom/configure
@@ -2286,6 +2286,14 @@ fi
 # Check whether --enable-qemu-traditional was given.
 if test "${enable_qemu_traditional+set}" = set; then :
   enableval=$enable_qemu_traditional;
+else
+
+    case "$host_cpu" in
+        i[3456]86|x86_64)
+           enable_qemu_traditional="yes";;
+        *) enable_qemu_traditional="no";;
+    esac
+
 fi
 
 if test "x$enable_qemu_traditional" = "xyes"; then :
diff --git a/stubdom/configure.ac b/stubdom/configure.ac
index e20d99edac..a07a1edae5 100644
--- a/stubdom/configure.ac
+++ b/stubdom/configure.ac
@@ -27,7 +27,13 @@ AX_STUBDOM_DEFAULT_ENABLE([xenstorepvh-stubdom], 
[xenstorepvh])
 AX_STUBDOM_CONDITIONAL([vtpm-stubdom], [vtpm])
 AX_STUBDOM_CONDITIONAL([vtpmmgr-stubdom], [vtpmmgr])
 
-AC_ARG_ENABLE([qemu-traditional])
+AC_ARG_ENABLE([qemu-traditional],,,[
+    case "$host_cpu" in
+        i[[3456]]86|x86_64)
+           enable_qemu_traditional="yes";;
+        *) enable_qemu_traditional="no";;
+    esac
+])
 AS_IF([test "x$enable_qemu_traditional" = "xyes"], [
     qemu_traditional=y],[
     qemu_traditional=n
diff --git a/tools/configure b/tools/configure
index 8bf8fe75b8..33814b24b3 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1502,8 +1502,8 @@ Optional Features:
   --disable-seabios       Disable SeaBIOS (default is ENABLED)
   --disable-golang        Disable Go tools (default is ENABLED)
   --enable-qemu-traditional
-                          Enable qemu traditional device model, (DEFAULT is
-                          off)
+                          Enable qemu traditional device model, (DEFAULT is on
+                          for Linux or NetBSD x86, otherwise off)
   --enable-rombios        Enable ROMBIOS, (DEFAULT is on if qemu-traditional
                           is enabled, otherwise off)
   --disable-ipxe          Enable in-tree IPXE, (DEFAULT is on if rombios is
@@ -4287,6 +4287,19 @@ LINUX_BACKEND_MODULES="`eval echo 
$LINUX_BACKEND_MODULES`"
 # Check whether --enable-qemu-traditional was given.
 if test "${enable_qemu_traditional+set}" = set; then :
   enableval=$enable_qemu_traditional;
+else
+
+    case "$host_cpu" in
+        i[3456]86|x86_64)
+           enable_qemu_traditional="yes";;
+        *) enable_qemu_traditional="no";;
+    esac
+    case "$host_os" in
+        freebsd*)
+           enable_qemu_traditional="no";;
+    esac
+
+
 fi
 
 if test "x$enable_qemu_traditional" = "xyes"; then :
diff --git a/tools/configure.ac b/tools/configure.ac
index a713fd34d6..6414fcbb44 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -120,7 +120,18 @@ AC_SUBST(LINUX_BACKEND_MODULES)
 
 AC_ARG_ENABLE([qemu-traditional],
     AS_HELP_STRING([--enable-qemu-traditional],
-                   [Enable qemu traditional device model, (DEFAULT is off)]))
+                   [Enable qemu traditional device model, (DEFAULT is on for 
Linux or NetBSD x86, otherwise off)]),,[
+    case "$host_cpu" in
+        i[[3456]]86|x86_64)
+           enable_qemu_traditional="yes";;
+        *) enable_qemu_traditional="no";;
+    esac
+    case "$host_os" in
+        freebsd*)
+           enable_qemu_traditional="no";;
+    esac
+
+])
 AS_IF([test "x$enable_qemu_traditional" = "xyes"], [
 AC_DEFINE([HAVE_QEMU_TRADITIONAL], [1], [Qemu traditional enabled])
     qemu_traditional=y],[
--
generated by git-patchbot for /home/xen/git/xen.git#staging