From: Michal Privoznik <mprivozn@redhat.com>
Date: Mon, 12 May 2025 12:29:21 +0000 (+0200)
Subject: virnetdevbridge: Include virnetlink.h more often
X-Git-Tag: v11.4.0-rc1~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a23a61496769613fa765a579eb3f9da558f0a8b;p=thirdparty%2Flibvirt.git

virnetdevbridge: Include virnetlink.h more often

The whole point of virnetlink.h is that it hides away the build
time dependency on netlink. It wraps netlink functions in our
functions which then have a stub implementation in case netlink
support was disabled.

Though, netlink is still Linux specific, so keep it in the
'#ifdef __linux__` block to cause a compilation error should
anybody try to use any of the wrapped functions on non-Linux.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
---

diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c
index 3b54e2cb1e..806ccc5fa7 100644
--- a/src/util/virnetdevbridge.c
+++ b/src/util/virnetdevbridge.c
@@ -30,9 +30,7 @@
 #endif
 
 #ifdef __linux__
-# if defined(WITH_LIBNL)
-#  include "virnetlink.h"
-# endif
+# include "virnetlink.h"
 # include <linux/sockios.h>
 # include <linux/param.h>     /* HZ                 */
 # include <linux/in6.h>