[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[PATCH 3/9] build: eliminate useless WITH_VIRTUALPORT check



WITH_VIRTUALPORT just checks that we are building on Linux and that
IFLA_PORT_MAX is defined in linux/if_link.h. Back when 802.11Qb[gh]
support was added, the IFLA_* stuff was new (introduced in kernel
2.6.35, backported to RHEL6 2.6.32 kernel at some point), and so this
extra check was necessary, because libvirt was being built on Linux
distros that didn't yet have IFLA_* (e.g. older RHEL6, all
RHEL5). It's been in the kernel for a *very* long time now, so all
supported versions of all Linux platforms libvirt builds on have it.

Note that the above paragraph implies that the conditional compilation
should be changed to #if defined(__linux__). However, the astute
reader will notice that the code in question is sending and receiving
netlink messages, so it really should be conditional on WITH_LIBNL
(which implies __linux__) instead, so that's what this patch does.

Signed-off-by: Laine Stump <laine redhat com>
---
 meson.build                      | 8 --------
 src/util/virnetdevvportprofile.c | 8 ++++----
 tools/virsh.c                    | 3 ---
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/meson.build b/meson.build
index 2e57a435df..073ea6d49e 100644
--- a/meson.build
+++ b/meson.build
@@ -1386,14 +1386,6 @@ endif
 
 util_dep = cc.find_library('util', required: false)
 
-if not get_option('virtualport').disabled()
-  if cc.has_header_symbol('linux/if_link.h', 'IFLA_PORT_MAX')
-    conf.set('WITH_VIRTUALPORT', 1)
-  elif get_option('virtualport').enabled()
-    error('Installed linux headers don\'t show support for virtual port support.')
-  endif
-endif
-
 if host_machine.system() == 'windows'
   ole32_dep = cc.find_library('ole32')
   oleaut32_dep = cc.find_library('oleaut32')
diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c
index 020683fa04..5dae8aa57d 100644
--- a/src/util/virnetdevvportprofile.c
+++ b/src/util/virnetdevvportprofile.c
@@ -46,7 +46,7 @@ VIR_ENUM_IMPL(virNetDevVPortProfileOp,
               "no-op",
 );
 
-#if WITH_VIRTUALPORT
+#if defined(WITH_LIBNL)
 
 # include <fcntl.h>
 
@@ -454,7 +454,7 @@ int virNetDevVPortProfileMerge3(virNetDevVPortProfilePtr *result,
 }
 
 
-#if WITH_VIRTUALPORT
+#if defined(WITH_LIBNL)
 
 static struct nla_policy ifla_port_policy[IFLA_PORT_MAX + 1] =
 {
@@ -1343,7 +1343,7 @@ virNetDevVPortProfileDisassociate(const char *macvtap_ifname,
     return rc;
 }
 
-#else /* ! WITH_VIRTUALPORT */
+#else /* !WITH_LIBNL */
 int virNetDevVPortProfileAssociate(const char *macvtap_ifname G_GNUC_UNUSED,
                                    const virNetDevVPortProfile *virtPort G_GNUC_UNUSED,
                                    const virMacAddr *macvtap_macaddr G_GNUC_UNUSED,
@@ -1369,4 +1369,4 @@ int virNetDevVPortProfileDisassociate(const char *macvtap_ifname G_GNUC_UNUSED,
                          _("Virtual port profile association not supported on this platform"));
     return -1;
 }
-#endif /* ! WITH_VIRTUALPORT */
+#endif /* !WITH_LIBNL */
diff --git a/tools/virsh.c b/tools/virsh.c
index ac9b7ad238..954778b626 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -548,9 +548,6 @@ virshShowVersion(vshControl *ctl G_GNUC_UNUSED)
 #endif
 #ifdef WITH_NWFILTER
     vshPrint(ctl, " Nwfilter");
-#endif
-#ifdef WITH_VIRTUALPORT
-    vshPrint(ctl, " VirtualPort");
 #endif
     vshPrint(ctl, "\n");
 
-- 
2.26.2


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]