]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
netlink: Fix build with libnl-3
authorJiri Denemark <jdenemar@redhat.com>
Wed, 9 May 2012 09:57:44 +0000 (11:57 +0200)
committerEric Blake <eblake@redhat.com>
Mon, 6 May 2013 15:10:33 +0000 (09:10 -0600)
Commit 642973135c54b93242c4548ef27d591b52b0994c added three direct
references to nl_handle_* instead of using our aliases which hide
differences between libnl-3 and libnl-1.
(cherry picked from commit d9d39e620989d2439b0c48e22acf0c4bc6ef83dc)

src/util/virnetlink.c

index 834b8e2aeab6bd524b8ce807a53e768510bbaa7c..9539694b222dae4e1eb32b4440483a3181fc1824 100644 (file)
@@ -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;
     }
 }