[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, bpo-squeeze, updated. debian/0.9.11-2-17-g8a2008d

[Guido Günther]

The following commit has been merged in the bpo-squeeze branch:
commit eb68005d165066499353d063a3b4a8ec74b8e257
Author: Guido Günther <agx at sigxcpu.org>
Date:   Tue Apr 17 14:45:28 2012 +0200

    virnetdev: Check for defined IFLA_VF_*
    
    Thanks: Philipp Hahn

diff --git a/debian/patches/series b/debian/patches/series
index 9a22cbe..e62c5d2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ Disable-gnulib-s-test-nonplocking-pipe.sh.patch
 Disable-failing-virnetsockettest.patch
 Don-t-fail-if-we-can-t-setup-avahi.patch
 virURIParse-don-t-forget-to-copy-the-user-part.patch
+virnetdev-Check-for-defined-IFLA_VF_.patch
diff --git a/debian/patches/virnetdev-Check-for-defined-IFLA_VF_.patch b/debian/patches/virnetdev-Check-for-defined-IFLA_VF_.patch
new file mode 100644
index 0000000..715d420
--- /dev/null
+++ b/debian/patches/virnetdev-Check-for-defined-IFLA_VF_.patch
@@ -0,0 +1,28 @@
+From: Philipp Hahn <hahn at univention.de>
+Date: Fri, 13 Apr 2012 15:43:58 +0200
+Subject: virnetdev: Check for defined IFLA_VF_*
+
+The linux-2.6.32 kernel header does not yet define IFLA_VF_MAX and others,
+which breaks compiling a new libvirt on old systems like Debian Squeeze.
+
+(I also have to add --without-macvtap --disable-werror --without-virtualport to
+ ./configure to get it to compile.)
+
+Signed-off-by: Philipp Hahn <hahn at univention.de>
+---
+ src/util/virnetdev.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
+index ec7435a..460aa83 100644
+--- a/src/util/virnetdev.c
++++ b/src/util/virnetdev.c
+@@ -1215,7 +1215,7 @@ virNetDevGetVirtualFunctionInfo(const char *vfname ATTRIBUTE_UNUSED,
+     return -1;
+ }
+ #endif /* !__linux__ */
+-#if defined(__linux__) && defined(HAVE_LIBNL)
++#if defined(__linux__) && defined(HAVE_LIBNL) && defined(IFLA_VF_MAX)
+ 
+ static struct nla_policy ifla_vf_policy[IFLA_VF_MAX+1] = {
+     [IFLA_VF_MAC]       = { .type = NLA_UNSPEC,

-- 
Libvirt Debian packaging