External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-04 21:35:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

meson: remove obsolete check for DEVLINK_CMD_ESWITCH_GET

Browse Source 
The DEVLINK_CMD_ESWITCH_GET constant was introduced to Linux in

  commit adf200f31c000d707e4afe238ed1d1199e0cce7c
  Author: Jiri Pirko <jiri@mellanox.com>
  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 <jtomko@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2022-12-08 09:45:20 +00:00
parent 2b23e72599
commit 21f2b9cf9d
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
meson.build
View File

@ -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' ],

6
src/util/virnetdev.c
View File

@ -44,6 +44,7 @@
# include <linux/if_vlan.h>
# include <linux/types.h>
# include <linux/ethtool.h>
# include <linux/devlink.h>
# 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 <net/if_dl.h>
#endif
#if WITH_LINUX_DEVLINK_H
# include <linux/devlink.h>
#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: