Commit f6507f1a authored by Ian Jackson's avatar Ian Jackson

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

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

This reverts commit ce309942.
parent b2851580
......@@ -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
......
......@@ -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 :
......
......@@ -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
......
......@@ -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 :
......
......@@ -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],[
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment