xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Wei Liu <wei.liu2@citrix.com>
To: Xen-devel <xen-devel@lists.xenproject.org>
Cc: "Wei Liu" <wei.liu2@citrix.com>,
	"Changlong Xie" <xiecl.fnst@cn.fujitsu.com>,
	"Ian Jackson" <Ian.Jackson@eu.citrix.com>,
	"Wen Congyang" <wency@cn.fujitsu.com>,
	"Roger Pau Monné" <roger.pau@citrix.com>
Subject: [PATCH v2 3/4] build: rename CONFIG_REMUS_NETBUF to CONFIG_LIBNL
Date: Wed, 6 Apr 2016 12:01:15 +0100	[thread overview]
Message-ID: <1459940476-23186-4-git-send-email-wei.liu2@citrix.com> (raw)
In-Reply-To: <1459940476-23186-1-git-send-email-wei.liu2@citrix.com>

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(-)

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
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

  parent reply	other threads:[~2016-04-06 11:00 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-06 11:01 [PATCH v2 0/4] COLO: only build when libnl is available Wei Liu
2016-04-06 11:01 ` [PATCH v2 1/4] libxl: colo: rearrange things in header files Wei Liu
2016-04-06 11:01 ` [PATCH v2 2/4] libxl: colo: move netlink related stuff to libxl_colo_proxy.c Wei Liu
2016-04-06 11:01 ` Wei Liu [this message]
2016-04-06 11:29   ` [PATCH v2 3/4] build: rename CONFIG_REMUS_NETBUF to CONFIG_LIBNL Andrew Cooper
2016-04-06 11:32     ` Wei Liu
2016-04-06 13:44   ` Ian Jackson
2016-04-06 11:01 ` [PATCH v2 4/4] libxl: colo: make it depend on availability of libnl Wei Liu
2016-04-06 13:44   ` Ian Jackson
2016-04-06 11:04 ` [PATCH v2 0/4] COLO: only build when libnl is available Wei Liu
2016-04-06 13:56   ` Wei Liu
2016-04-06 14:10     ` Ian Jackson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1459940476-23186-4-git-send-email-wei.liu2@citrix.com \
    --to=wei.liu2@citrix.com \
    --cc=Ian.Jackson@eu.citrix.com \
    --cc=roger.pau@citrix.com \
    --cc=wency@cn.fujitsu.com \
    --cc=xen-devel@lists.xenproject.org \
    --cc=xiecl.fnst@cn.fujitsu.com \
    --subject='Re: [PATCH v2 3/4] build: rename CONFIG_REMUS_NETBUF to CONFIG_LIBNL' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).