From abf68227c74c8b83df43078a1cebdc4e5b991b50 Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Tue, 5 Apr 2016 19:44:29 +0100 Subject: [PATCH] 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 Acked-by: Ian Jackson --- config/Tools.mk.in | 2 +- tools/configure | 14 +++++++------- tools/configure.ac | 8 ++++---- tools/hotplug/Linux/Makefile | 2 +- tools/libxl/Makefile | 6 +++--- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/config/Tools.mk.in b/config/Tools.mk.in index ccfe13719b..0f79f4e0c2 100644 --- 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 ee6c33f615..a7d0f1aeb2 100755 --- 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 5b5dda49e4..d0c9e63b7c 100644 --- 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 b5fd2db7a1..6d6cceea75 100644 --- 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 a433aaad02..ca295129e6 100644 --- 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 -- 2.30.2