diff options
author | Ian Campbell <ian.campbell@citrix.com> | 2013-09-12 11:34:12 +0100 |
---|---|---|
committer | Ian Campbell <ian.campbell@citrix.com> | 2013-09-17 17:39:53 +0100 |
commit | cf59b4cd9f85631d4c38d6df05e7e432fca5a8f0 (patch) | |
tree | f36a5bb978957daccc890caedb1d4b95cc710e6f /tools | |
parent | d3900dea28f9ab8207c35365b5fee2058b68fe91 (diff) | |
download | xen-cf59b4cd9f85631d4c38d6df05e7e432fca5a8f0.tar.gz xen-cf59b4cd9f85631d4c38d6df05e7e432fca5a8f0.tar.bz2 xen-cf59b4cd9f85631d4c38d6df05e7e432fca5a8f0.zip |
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>
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/configure | 27 | ||||
-rw-r--r-- | tools/configure.ac | 15 | ||||
-rwxr-xr-x | tools/hotplug/Linux/init.d/xend | 4 | ||||
-rwxr-xr-x | tools/python/xen/xm/xm | 15 |
4 files changed, 57 insertions, 4 deletions
diff --git a/tools/configure b/tools/configure index 0dee92ad32..1da8652587 100755 --- 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 2e57bfc0a0..4f3c33a306 100644 --- 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 5f92cdc6e9..8921383f1b 100755 --- 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 f4fd200346..458f219e10 100755 --- 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) |