tools: disable xend build by default

Add big warnings to configure, xend initscript and xm.

The big xm warning is displayed once (per boot, or per tmpreaper clean),
afterwards a single line warning is displayed.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/tools/configure b/tools/configure
index 0dee92ad32f0aad49ef8fd24d089aa4e4fe57f78..1da8652587b24697e838e34918da9dbb04e7a9b3 100755 (executable)
--- a/tools/configure
+++ b/tools/configure
@@ -1424,7 +1424,7 @@ Optional Features:
   --disable-rombios       Disable ROM BIOS (default is ENABLED)
   --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-xend           Enable xend toolstack (default is DISABLED)
   --enable-blktap1        Disable blktap1 tools (default is DISABLED)
   --enable-qemu-traditional
                           Enable qemu traditional device model, (DEFAULT is on
@@ -3671,7 +3671,7 @@ elif test "x$enable_xend" = "xyes"; then :
 
 elif test -z $ax_cv_xend; then :
 
-    ax_cv_xend="y"
+    ax_cv_xend="n"
 
 fi
 xend=$ax_cv_xend
@@ -9235,3 +9235,26 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
+
+if test "x$xend" = "xy" ; then :
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You have enabled the xend toolstack.
+
+xend is deprecated and scheduled for removal. Please migrate to another
+toolstack ASAP.
+
+See http://wiki.xen.org/wiki/Choice_of_Toolstacks for information on
+other alternatives, including xl which is designed to be a drop in
+replacement for xm (http://wiki.xen.org/wiki/XL).
+" >&5
+$as_echo "$as_me: WARNING: You have enabled the xend toolstack.
+
+xend is deprecated and scheduled for removal. Please migrate to another
+toolstack ASAP.
+
+See http://wiki.xen.org/wiki/Choice_of_Toolstacks for information on
+other alternatives, including xl which is designed to be a drop in
+replacement for xm (http://wiki.xen.org/wiki/XL).
+" >&2;}
+
+fi

diff --git a/tools/configure.ac b/tools/configure.ac
index 2e57bfc0a099d25f3db6b46b3826bfddd40cf412..4f3c33a306c5603a867a3def4623f6902088e215 100644 (file)
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -57,7 +57,7 @@ AX_ARG_DEFAULT_DISABLE([ovmf], [Enable OVMF])
 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([xend], [Enable xend toolstack])
 AX_ARG_DEFAULT_DISABLE([blktap1], [Disable blktap1 tools])
 
 AC_ARG_ENABLE([qemu-traditional],
@@ -220,3 +220,16 @@ AC_SUBST(libiconv)
 AC_CHECK_HEADERS([yajl/yajl_version.h sys/eventfd.h])
 
 AC_OUTPUT()
+
+AS_IF([test "x$xend" = "xy" ], [
+    AC_MSG_WARN(
+[You have enabled the xend toolstack.
+
+xend is deprecated and scheduled for removal. Please migrate to another
+toolstack ASAP.
+
+See http://wiki.xen.org/wiki/Choice_of_Toolstacks for information on
+other alternatives, including xl which is designed to be a drop in
+replacement for xm (http://wiki.xen.org/wiki/XL).
+])
+])

diff --git a/tools/hotplug/Linux/init.d/xend b/tools/hotplug/Linux/init.d/xend
index 5f92cdc6e90829bc77fbdc50bd20e52459a26090..8921383f1b4502f6daa5445f159b7356f656e7ea 100755 (executable)
--- a/tools/hotplug/Linux/init.d/xend
+++ b/tools/hotplug/Linux/init.d/xend
@@ -38,6 +38,10 @@ function await_daemons_up
 
 case "$1" in
   start)
+       echo "WARNING: Enabling the xend toolstack."
+       echo "xend is deprecated and scheduled for removal. Please migrate"
+       echo "to another toolstack ASAP."
+
        if [ -z "`ps -C xenconsoled -o pid=`" ]; then
                echo "xencommons should be started first."
                exit 1

diff --git a/tools/python/xen/xm/xm b/tools/python/xen/xm/xm
index f4fd2003463cb57557b2c6457a2dadcfd71d4c21..458f219e10aa9fecf31bd8585365250393c3afdc 100755 (executable)
--- a/tools/python/xen/xm/xm
+++ b/tools/python/xen/xm/xm
@@ -1,7 +1,20 @@
 #!/usr/bin/env python
 #  -*- mode: python; -*-
-import sys
+import sys, os.path
 
 from xen.xm import main
 
+print("WARNING: xend/xm is deprecated.")
+
+if not os.path.exists("/tmp/xm-deprecation-long-warning"):
+    print("""
+xend is deprecated and scheduled for removal. Please migrate to another
+toolstack ASAP.
+
+See http://wiki.xen.org/wiki/Choice_of_Toolstacks for information on
+other alternatives, including xl which is designed to be a drop in
+replacement for xm (http://wiki.xen.org/wiki/XL).
+""")
+    open("/tmp/xm-deprecation-long-warning", "w").close()
+
 main.main(sys.argv)