| Message ID | 1459940476-23186-4-git-send-email-wei.liu2@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 06/04/16 12:01, Wei Liu wrote: > diff --git a/tools/configure.ac b/tools/configure.ac > index 5b5dda4..79ff25e 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. > + AC_MSG_WARN([Disabling support for Remus network buffering and COLO. > Please install libnl3 libraries, command line tools and devel > headers - version 3.2.8 or higher]) While playing in this area, could the text be expanded to something like: "Please install libnl3 libraries (including libnl-route)" I spent a rather long time trying to work out I couldn't enable netbuf on a fresh install, as they are separate packages. ~Andrew
On Wed, Apr 06, 2016 at 12:29:34PM +0100, Andrew Cooper wrote: > On 06/04/16 12:01, Wei Liu wrote: > > diff --git a/tools/configure.ac b/tools/configure.ac > > index 5b5dda4..79ff25e 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. > > + AC_MSG_WARN([Disabling support for Remus network buffering and COLO. > > Please install libnl3 libraries, command line tools and devel > > headers - version 3.2.8 or higher]) > > While playing in this area, could the text be expanded to something like: > > "Please install libnl3 libraries (including libnl-route)" > > I spent a rather long time trying to work out I couldn't enable netbuf > on a fresh install, as they are separate packages. > Oh sure. :-) Wei. > ~Andrew
Wei Liu writes ("[PATCH v2 3/4] 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>
> ---
> I committed configure changes as well. Feel free to rerun autogen.sh.
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
diff --git a/config/Tools.mk.in b/config/Tools.mk.in index ccfe137..0f79f4e 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 ee6c33f..bd22115 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. + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling support for Remus network buffering and COLO. Please install libnl3 libraries, command line tools and devel headers - version 3.2.8 or higher" >&5 -$as_echo "$as_me: WARNING: Disabling support for Remus network buffering. +$as_echo "$as_me: WARNING: Disabling support for Remus network buffering and COLO. Please install libnl3 libraries, 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 5b5dda4..79ff25e 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. + AC_MSG_WARN([Disabling support for Remus network buffering and COLO. Please install libnl3 libraries, 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 b5fd2db..6d6ccee 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 a433aaa..ca29512 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
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> --- I committed configure changes as well. Feel free to rerun autogen.sh. --- config/Tools.mk.in | 2 +- tools/configure | 10 +++++----- tools/configure.ac | 6 +++--- tools/hotplug/Linux/Makefile | 2 +- tools/libxl/Makefile | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-)