From 76c66c689b8591a8d185586cdd8a1bbbf393ffb6 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@citrix.com>
Date: Wed, 31 Jul 2013 16:15:56 +0100
Subject: tools: disable blktap1 build by default

I don't think there are any dom0's around whose kernels support only blktap1
and not something newer like blktap2 or qdisk. Certainly not that you would
want to run Xen 4.4 on.

libxl will never use blktap1.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
 config/Tools.mk.in           |  1 +
 tools/Makefile               |  4 ++--
 tools/configure              | 26 ++++++++++++++++++++++++++
 tools/configure.ac           |  1 +
 tools/hotplug/Linux/Makefile |  4 +++-
 5 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/config/Tools.mk.in b/config/Tools.mk.in
index 7ee158163d..1915295d50 100644
--- a/config/Tools.mk.in
+++ b/config/Tools.mk.in
@@ -51,6 +51,7 @@ CONFIG_OVMF         := @ovmf@
 CONFIG_ROMBIOS      := @rombios@
 CONFIG_SEABIOS      := @seabios@
 CONFIG_XEND         := @xend@
+CONFIG_BLKTAP1      := @blktap1@
 
 #System options
 ZLIB                := @zlib@
diff --git a/tools/Makefile b/tools/Makefile
index 1000ee372f..381af04849 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -16,8 +16,8 @@ SUBDIRS-y += console
 SUBDIRS-y += xenmon
 SUBDIRS-y += xenstat
 SUBDIRS-$(CONFIG_Linux) += memshr 
-ifeq ($(CONFIG_X86),y)
-SUBDIRS-$(CONFIG_Linux) += blktap
+ifeq ($(CONFIG_X86)$(CONFIG_Linux),yy)
+SUBDIRS-$(CONFIG_BLKTAP1) += blktap
 endif
 SUBDIRS-$(CONFIG_Linux) += blktap2
 SUBDIRS-$(CONFIG_NetBSD) += blktap2
diff --git a/tools/configure b/tools/configure
index 8df24e6631..ad4b5feb42 100755
--- a/tools/configure
+++ b/tools/configure
@@ -654,6 +654,7 @@ APPEND_LIB
 APPEND_INCLUDES
 PREPEND_LIB
 PREPEND_INCLUDES
+blktap1
 xend
 debug
 seabios
@@ -732,6 +733,7 @@ enable_rombios
 enable_seabios
 enable_debug
 enable_xend
+enable_blktap1
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1391,6 +1393,7 @@ Optional Features:
   --disable-seabios       Disable SeaBIOS (default is ENABLED)
   --disable-debug         Disable debug build of tools (default is ENABLED)
   --disable-xend          Disable xend toolstack (default is ENABLED)
+  --enable-blktap1        Disable blktap1 tools (default is DISABLED)
 
 Some influential environment variables:
   CC          C compiler command
@@ -3628,6 +3631,29 @@ xend=$ax_cv_xend
 
 
 
+# Check whether --enable-blktap1 was given.
+if test "${enable_blktap1+set}" = set; then :
+  enableval=$enable_blktap1;
+fi
+
+
+if test "x$enable_blktap1" = "xno"; then :
+
+    ax_cv_blktap1="n"
+
+elif test "x$enable_blktap1" = "xyes"; then :
+
+    ax_cv_blktap1="y"
+
+elif test -z $ax_cv_blktap1; then :
+
+    ax_cv_blktap1="n"
+
+fi
+blktap1=$ax_cv_blktap1
+
+
+
 
 
 
diff --git a/tools/configure.ac b/tools/configure.ac
index 2a72d027b1..1b4625a299 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -58,6 +58,7 @@ AX_ARG_DEFAULT_ENABLE([rombios], [Disable ROM BIOS])
 AX_ARG_DEFAULT_ENABLE([seabios], [Disable SeaBIOS])
 AX_ARG_DEFAULT_ENABLE([debug], [Disable debug build of tools])
 AX_ARG_DEFAULT_ENABLE([xend], [Disable xend toolstack])
+AX_ARG_DEFAULT_DISABLE([blktap1], [Disable blktap1 tools])
 
 AC_ARG_VAR([PREPEND_INCLUDES],
     [List of include folders to prepend to CFLAGS (without -I)])
diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile
index b7737ab498..47655f691a 100644
--- a/tools/hotplug/Linux/Makefile
+++ b/tools/hotplug/Linux/Makefile
@@ -18,11 +18,13 @@ XEN_SCRIPTS += vif2
 XEN_SCRIPTS += vif-setup
 XEN_SCRIPTS += block
 XEN_SCRIPTS += block-enbd block-nbd
-XEN_SCRIPTS += blktap
+XEN_SCRIPTS-$(CONFIG_BLKTAP1) += blktap
 XEN_SCRIPTS += xen-hotplug-cleanup
 XEN_SCRIPTS += external-device-migrate
 XEN_SCRIPTS += vscsi
 XEN_SCRIPTS += block-iscsi
+XEN_SCRIPTS += $(XEN_SCRIPTS-y)
+
 XEN_SCRIPT_DATA = xen-script-common.sh locking.sh logging.sh
 XEN_SCRIPT_DATA += xen-hotplug-common.sh xen-network-common.sh vif-common.sh
 XEN_SCRIPT_DATA += block-common.sh
-- 
cgit v1.2.3