From: Jiri Denemark <jdenemar@redhat.com>
Date: Wed, 9 May 2012 09:57:44 +0000 (+0200)
Subject: netlink: Fix build with libnl-3
X-Git-Tag: v0.9.12-rc2^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9d39e620989d2439b0c48e22acf0c4bc6ef83dc;p=thirdparty%2Flibvirt.git

netlink: Fix build with libnl-3

Commit 642973135c54b93242c4548ef27d591b52b0994c added three direct
references to nl_handle_* instead of using our aliases which hide
differences between libnl-3 and libnl-1.
---

diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c
index ac61ff086e..e316137648 100644
--- a/src/util/virnetlink.c
+++ b/src/util/virnetlink.c
@@ -98,7 +98,7 @@ static int nextWatch = 1;
 # define NETLINK_EVENT_ALLOC_EXTENT 10
 
 static virNetlinkEventSrvPrivatePtr server = NULL;
-static struct nl_handle *placeholder_nlhandle = NULL;
+static virNetlinkHandle *placeholder_nlhandle = NULL;
 
 /* Function definitions */
 
@@ -130,7 +130,7 @@ virNetlinkStartup(void)
 {
     if (placeholder_nlhandle)
         return 0;
-    placeholder_nlhandle = nl_handle_alloc();
+    placeholder_nlhandle = virNetlinkAlloc();
     if (!placeholder_nlhandle) {
         virReportSystemError(errno, "%s",
                              _("cannot allocate placeholder nlhandle for netlink"));
@@ -149,7 +149,7 @@ void
 virNetlinkShutdown(void)
 {
     if (placeholder_nlhandle) {
-        nl_handle_destroy(placeholder_nlhandle);
+        virNetlinkFree(placeholder_nlhandle);
         placeholder_nlhandle = NULL;
     }
 }