|
 |
9bac43 |
From 4506913c42c58ef5a667779596af1c4bd1b11102 Mon Sep 17 00:00:00 2001
|
|
|
9bac43 |
From: Laurent Vivier <lvivier@redhat.com>
|
|
|
9bac43 |
Date: Fri, 6 Oct 2017 16:04:07 +0200
|
|
|
9bac43 |
Subject: [PATCH 04/69] redhat: add CONFIG_RHV flag
|
|
|
9bac43 |
|
|
|
9bac43 |
RH-Author: Laurent Vivier <lvivier@redhat.com>
|
|
|
9bac43 |
Message-id: <20171006160407.18609-1-lvivier@redhat.com>
|
|
|
9bac43 |
Patchwork-id: 76906
|
|
|
9bac43 |
O-Subject: [RHV7.5 qemu-kvm-rhev PATCH v3] redhat: add CONFIG_RHV flag
|
|
|
9bac43 |
Bugzilla: 1498865
|
|
|
9bac43 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9bac43 |
|
|
|
9bac43 |
We need to know if the binaries we build are for qemu-kvm-rhev
|
|
|
9bac43 |
or qemu-kvm-ma.
|
|
|
9bac43 |
|
|
|
9bac43 |
Add an option to configure to select the target:
|
|
|
9bac43 |
--rhel-target=rhv for qemu-kvm-rhev or
|
|
|
9bac43 |
--rhel-target=rhel for qemu-kvm-ma.
|
|
|
9bac43 |
|
|
|
9bac43 |
If RHEL target is rhv, the CONFIG_RHV macro is defined.
|
|
|
9bac43 |
By default, configure selects "rhv" target.
|
|
|
9bac43 |
|
|
|
9bac43 |
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
9bac43 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9bac43 |
---
|
|
|
9bac43 |
configure | 9 +++++++++
|
|
|
9bac43 |
redhat/Makefile | 2 +-
|
|
|
9bac43 |
redhat/Makefile.local | 1 +
|
|
|
9bac43 |
redhat/build_configure.sh | 9 +++++++++
|
|
|
9bac43 |
redhat/qemu-kvm.spec.template | 5 +++++
|
|
|
9bac43 |
5 files changed, 25 insertions(+), 1 deletion(-)
|
|
|
9bac43 |
|
|
|
9bac43 |
diff --git a/configure b/configure
|
|
|
9bac43 |
index 457b2ff..0da6821 100755
|
|
|
9bac43 |
--- a/configure
|
|
|
9bac43 |
+++ b/configure
|
|
|
9bac43 |
@@ -407,6 +407,7 @@ jemalloc="no"
|
|
|
9bac43 |
replication="yes"
|
|
|
9bac43 |
vxhs=""
|
|
|
9bac43 |
vtd="yes"
|
|
|
9bac43 |
+rhel_target="rhv"
|
|
|
9bac43 |
|
|
|
9bac43 |
supported_cpu="no"
|
|
|
9bac43 |
supported_os="no"
|
|
|
9bac43 |
@@ -1301,6 +1302,8 @@ for opt do
|
|
|
9bac43 |
;;
|
|
|
9bac43 |
--enable-vtd) vtd="yes"
|
|
|
9bac43 |
;;
|
|
|
9bac43 |
+ --rhel-target=*) rhel_target="$optarg"
|
|
|
9bac43 |
+ ;;
|
|
|
9bac43 |
*)
|
|
|
9bac43 |
echo "ERROR: unknown option $opt"
|
|
|
9bac43 |
echo "Try '$0 --help' for more information"
|
|
|
9bac43 |
@@ -1469,6 +1472,7 @@ Advanced options (experts only):
|
|
|
9bac43 |
xen pv domain builder
|
|
|
9bac43 |
--enable-debug-stack-usage
|
|
|
9bac43 |
track the maximum stack usage of stacks created by qemu_alloc_stack
|
|
|
9bac43 |
+ --rhel-target set RHEL target (rhv or rhel)
|
|
|
9bac43 |
|
|
|
9bac43 |
Optional features, enabled with --enable-FEATURE and
|
|
|
9bac43 |
disabled with --disable-FEATURE, default is enabled if available:
|
|
|
9bac43 |
@@ -5395,6 +5399,7 @@ echo "avx2 optimization $avx2_opt"
|
|
|
9bac43 |
echo "replication support $replication"
|
|
|
9bac43 |
echo "VxHS block device $vxhs"
|
|
|
9bac43 |
echo "VT-d emulation $vtd"
|
|
|
9bac43 |
+echo "RHEL target $rhel_target"
|
|
|
9bac43 |
|
|
|
9bac43 |
if test "$sdl_too_old" = "yes"; then
|
|
|
9bac43 |
echo "-> Your SDL version is too old - please upgrade to have SDL support"
|
|
|
9bac43 |
@@ -6064,6 +6069,10 @@ if test "$vtd" = "yes" ; then
|
|
|
9bac43 |
echo "CONFIG_VTD=y" >> $config_host_mak
|
|
|
9bac43 |
fi
|
|
|
9bac43 |
|
|
|
9bac43 |
+if test "$rhel_target" = "rhv" ; then
|
|
|
9bac43 |
+ echo "CONFIG_RHV=y" >> $config_host_mak
|
|
|
9bac43 |
+fi
|
|
|
9bac43 |
+
|
|
|
9bac43 |
if test "$tcg_interpreter" = "yes"; then
|
|
|
9bac43 |
QEMU_INCLUDES="-I\$(SRC_PATH)/tcg/tci $QEMU_INCLUDES"
|
|
|
9bac43 |
elif test "$ARCH" = "sparc64" ; then
|
|
|
9bac43 |
--
|
|
|
9bac43 |
1.8.3.1
|
|
|
9bac43 |
|