build: rename CONFIG_REMUS_NETBUF to CONFIG_LIBNL

COLO and Remus net buffer support both depend on the availability of
libnl. Use a generic name.

No functional changes.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/config/Tools.mk.in b/config/Tools.mk.in
index ccfe13719be283014c2488f00c8bab0f7d69b748..0f79f4e0c204f33f53e2fc6424001297d4064274 100644 (file)
--- a/config/Tools.mk.in
+++ b/config/Tools.mk.in
@@ -58,7 +58,7 @@ CONFIG_QEMU_TRAD    := @qemu_traditional@
 CONFIG_QEMU_XEN     := @qemu_xen@
 CONFIG_BLKTAP2      := @blktap2@
 CONFIG_QEMUU_EXTRA_ARGS:= @EXTRA_QEMUU_CONFIGURE_ARGS@
-CONFIG_REMUS_NETBUF := @remus_netbuf@
+CONFIG_LIBNL        := @libnl@
 
 CONFIG_SYSTEMD      := @systemd@
 SYSTEMD_CFLAGS      := @SYSTEMD_CFLAGS@

diff --git a/tools/configure b/tools/configure
index ee6c33f61555ed282ada5c58347645fd22837280..a7d0f1aeb28a0f600799842811dcbd426f6b9793 100755 (executable)
--- a/tools/configure
+++ b/tools/configure
@@ -629,7 +629,7 @@ SYSTEMD_CFLAGS
 SYSTEMD_MODULES_LOAD
 SYSTEMD_DIR
 systemd
-remus_netbuf
+libnl
 LIBNL3_LIBS
 LIBNL3_CFLAGS
 argp_ldflags
@@ -9068,18 +9068,18 @@ fi
 
 if test "x$libnl3_lib" = "xn" ; then :
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling support for Remus network buffering.
-    Please install libnl3 libraries, command line tools and devel
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling support for Remus network buffering and COLO.
+    Please install libnl3 libraries (including libnl3-route), command line tools and devel
     headers - version 3.2.8 or higher" >&5
-$as_echo "$as_me: WARNING: Disabling support for Remus network buffering.
-    Please install libnl3 libraries, command line tools and devel
+$as_echo "$as_me: WARNING: Disabling support for Remus network buffering and COLO.
+    Please install libnl3 libraries (including libnl3-route), command line tools and devel
     headers - version 3.2.8 or higher" >&2;}
-    remus_netbuf=n
+    libnl=n
 
 
 else
 
-    remus_netbuf=y
+    libnl=y
 
 
 fi

diff --git a/tools/configure.ac b/tools/configure.ac
index 5b5dda49e45ce059f730099c6daae6c094271d1f..d0c9e63b7cbf607e95487a0727e1cc5f63d7dd93 100644 (file)
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -410,12 +410,12 @@ PKG_CHECK_MODULES(LIBNL3, [libnl-3.0 >= 3.2.8 libnl-route-3.0 >= 3.2.8],
     [libnl3_lib="y"], [libnl3_lib="n"])
 
 AS_IF([test "x$libnl3_lib" = "xn" ], [
-    AC_MSG_WARN([Disabling support for Remus network buffering.
-    Please install libnl3 libraries, command line tools and devel
+    AC_MSG_WARN([Disabling support for Remus network buffering and COLO.
+    Please install libnl3 libraries (including libnl3-route), command line tools and devel
     headers - version 3.2.8 or higher])
-    AC_SUBST(remus_netbuf, [n])
+    AC_SUBST(libnl, [n])
     ],[
-    AC_SUBST(remus_netbuf, [y])
+    AC_SUBST(libnl, [y])
 ])
 
 AC_SUBST(LIBNL3_LIBS)

diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile
index b5fd2db7a1f15e40b6ecfc8aa3bf9d612f716133..6d6cceea7515fb84d41191cba9fcbe25fedcbf65 100644 (file)
--- a/tools/hotplug/Linux/Makefile
+++ b/tools/hotplug/Linux/Makefile
@@ -18,7 +18,7 @@ XEN_SCRIPTS += vif-nat
 XEN_SCRIPTS += vif-openvswitch
 XEN_SCRIPTS += vif2
 XEN_SCRIPTS += vif-setup
-XEN_SCRIPTS-$(CONFIG_REMUS_NETBUF) += remus-netbuf-setup
+XEN_SCRIPTS-$(CONFIG_LIBNL) += remus-netbuf-setup
 XEN_SCRIPTS += block
 XEN_SCRIPTS += block-enbd block-nbd
 XEN_SCRIPTS += xen-hotplug-cleanup

diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
index a433aaad02cc31813a5a25c9d0f7925015344091..ca295129e68009e4c3bc57da9faf1f7ece19c314 100644 (file)
--- a/tools/libxl/Makefile
+++ b/tools/libxl/Makefile
@@ -21,7 +21,7 @@ endif
 
 LIBXL_LIBS =
 LIBXL_LIBS = $(LDLIBS_libxentoollog) $(LDLIBS_libxenevtchn) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(LDLIBS_libblktapctl) $(PTYFUNCS_LIBS) $(LIBUUID_LIBS)
-ifeq ($(CONFIG_REMUS_NETBUF),y)
+ifeq ($(CONFIG_LIBNL),y)
 LIBXL_LIBS += $(LIBNL3_LIBS)
 endif
 
@@ -31,7 +31,7 @@ CFLAGS_LIBXL += $(CFLAGS_libxenctrl)
 CFLAGS_LIBXL += $(CFLAGS_libxenguest)
 CFLAGS_LIBXL += $(CFLAGS_libxenstore)
 CFLAGS_LIBXL += $(CFLAGS_libblktapctl) 
-ifeq ($(CONFIG_REMUS_NETBUF),y)
+ifeq ($(CONFIG_LIBNL),y)
 CFLAGS_LIBXL += $(LIBNL3_CFLAGS)
 endif
 CFLAGS_LIBXL += -Wshadow
@@ -52,7 +52,7 @@ else
 LIBXL_OBJS-y += libxl_noblktap2.o
 endif
 
-ifeq ($(CONFIG_REMUS_NETBUF),y)
+ifeq ($(CONFIG_LIBNL),y)
 LIBXL_OBJS-y += libxl_netbuffer.o
 else
 LIBXL_OBJS-y += libxl_nonetbuffer.o