Revert "tools: disable building qemu-trad per default"

Unfortunately this breaks the gitlab CI.  See mails on-list.

This reverts commit ce309942c791628ff42082d1b74bfaeaa5267ae0.

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5ab49e779bd6d1976e9a8c690dcebf543f1f446..e7107ac3de9f973fd4ef1375cec76a787294d0af 100644 (file)
--- 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 07b709f99859a6df6fb444826a669cced1199bf6..df31532abb39c12f01a652ff85b79f59516eea38 100755 (executable)
--- 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 e20d99edac0da88098f4806333edde9f31dbc1a7..a07a1edae5ee6fdf0ae99f12c85022787217cd1f 100644 (file)
--- 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 8bf8fe75b83bd9c68d375368c9660ae73abc277c..33814b24b33de309160bcbe3f8e1429a1c301f26 100755 (executable)
--- 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 a713fd34d6d08cb6089046a052ad00aca6a07e0e..6414fcbb445e98aa821ace0e4680fa56e954df21 100644 (file)
--- 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],[