From 21f2b9cf9dad5fa5b9e512f9443197a79263036e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Thu, 8 Dec 2022 09:45:20 +0000 Subject: [PATCH] meson: remove obsolete check for DEVLINK_CMD_ESWITCH_GET MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The DEVLINK_CMD_ESWITCH_GET constant was introduced to Linux in commit adf200f31c000d707e4afe238ed1d1199e0cce7c Author: Jiri Pirko Date: Thu Feb 9 15:54:33 2017 +0100 devlink: fix the name of eswitch commands This is old enough that all our supported platforms can be assumed to have this feature. Reviewed-by: Ján Tomko Signed-off-by: Daniel P. Berrangé --- meson.build | 11 ----------- src/util/virnetdev.c | 6 ++---- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/meson.build b/meson.build index 79f9d47520..30dd797ee5 100644 --- a/meson.build +++ b/meson.build @@ -613,11 +613,6 @@ headers = [ 'xlocale.h', ] -if host_machine.system() == 'linux' - # check for DEVLINK_CMD_ESWITCH_GET - headers += 'linux/devlink.h' -endif - if host_machine.system() == 'freebsd' headers += 'libutil.h' endif @@ -652,12 +647,6 @@ symbols = [ if host_machine.system() == 'linux' symbols += [ - # check for DEVLINK_CMD_ESWITCH_GET - # Assume DEVLINK_ESWITCH_MODE_SWITCHDEV is also available, as it was - # introudced in kernel 4.8 along with the original spelling of this - # constant (DEVLINK_CMD_ESWITCH_MODE_GET, not supported by libvirt). - [ 'linux/devlink.h', 'DEVLINK_CMD_ESWITCH_GET' ], - # check for VHOST_VSOCK_SET_GUEST_CID [ 'linux/vhost.h', 'VHOST_VSOCK_SET_GUEST_CID' ], diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index e0a1eb54e5..62d8162e03 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -44,6 +44,7 @@ # include # include # include +# include # define VIR_NETDEV_FAMILY AF_UNIX #elif defined(WITH_STRUCT_IFREQ) && defined(AF_LOCAL) # define VIR_NETDEV_FAMILY AF_LOCAL @@ -56,9 +57,6 @@ # include #endif -#if WITH_LINUX_DEVLINK_H -# include -#endif #ifndef IFNAMSIZ # define IFNAMSIZ 16 @@ -3112,7 +3110,7 @@ virNetDevGetEthtoolFeatures(const char *ifname, } -# if defined(WITH_LIBNL) && WITH_DECL_DEVLINK_CMD_ESWITCH_GET +# if defined(WITH_LIBNL) /** * virNetDevGetFamilyId: