[libvirt] [PATCH] Fix macvtap detection by also checking for IFLA_VF_MAX
since this isn't available on older kernels such as Debian Squeeze's 2.6.32. This make --with-macvtap=check work as expected. --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) O.k. to apply? Cheers, -- Guido diff --git a/configure.ac b/configure.ac index 3f5b3ff..53c9b34 100644 --- a/configure.ac +++ b/configure.ac @@ -2534,7 +2534,8 @@ AC_MSG_CHECKING([whether to compile with macvtap support]) if test "$with_macvtap" != "no" ; then AC_TRY_COMPILE([ #include <sys/socket.h> #include <linux/rtnetlink.h> ], - [ int x = MACVLAN_MODE_BRIDGE; ], + [ int x = MACVLAN_MODE_BRIDGE; + int y = IFLA_VF_MAX; ], [ with_macvtap=yes ], [ if test "$with_macvtap" = "yes" ; then AC_MSG_ERROR([Installed linux headers don't show support for macvtap device.]) -- 1.7.9.5
On 04/14/2012 11:18 AM, Guido Günther wrote:
since this isn't available on older kernels such as Debian Squeeze's 2.6.32. This make --with-macvtap=check work as expected. --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
O.k. to apply? Cheers, -- Guido
diff --git a/configure.ac b/configure.ac index 3f5b3ff..53c9b34 100644 --- a/configure.ac +++ b/configure.ac @@ -2534,7 +2534,8 @@ AC_MSG_CHECKING([whether to compile with macvtap support]) if test "$with_macvtap" != "no" ; then AC_TRY_COMPILE([ #include <sys/socket.h> #include <linux/rtnetlink.h> ], - [ int x = MACVLAN_MODE_BRIDGE; ], + [ int x = MACVLAN_MODE_BRIDGE; + int y = IFLA_VF_MAX; ], [ with_macvtap=yes ],
ACK. -- Eric Blake eblake@redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
On Sat, Apr 14, 2012 at 03:45:44PM -0600, Eric Blake wrote:
On 04/14/2012 11:18 AM, Guido Günther wrote:
since this isn't available on older kernels such as Debian Squeeze's 2.6.32. This make --with-macvtap=check work as expected. --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
O.k. to apply? Cheers, -- Guido
diff --git a/configure.ac b/configure.ac index 3f5b3ff..53c9b34 100644 --- a/configure.ac +++ b/configure.ac @@ -2534,7 +2534,8 @@ AC_MSG_CHECKING([whether to compile with macvtap support]) if test "$with_macvtap" != "no" ; then AC_TRY_COMPILE([ #include <sys/socket.h> #include <linux/rtnetlink.h> ], - [ int x = MACVLAN_MODE_BRIDGE; ], + [ int x = MACVLAN_MODE_BRIDGE; + int y = IFLA_VF_MAX; ], [ with_macvtap=yes ],
ACK. Pushed. Thanks. With this we can build on Debian Squeeze again without any special configure options besides --disable-error. This is still needed since libnl triggers some warnings:
cc1: warnings being treated as errors /usr/include/netlink/object.h:58: error: inline function 'nl_object_priv' declared but never defined Cheers, -- Guido
participants (2)
-
Eric Blake -
Guido Günther