[libvirt PATCH 19/21] meson: remove obsolete check for VHOST_VSOCK_SET_GUEST_CID
The VHOST_VSOCK_SET_GUEST_CID constant was introduced to Linux in
commit 433fc58e6bf2c8bd97e57153ed28e64fd78207b8
Author: Asias He <asias(a)redhat.com>
Date: Thu Jul 28 15:36:34 2016 +0100
VSOCK: Introduce vhost_vsock.ko
This is old enough that all our supported platforms can be assumed
to have this feature.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
meson.build | 3 ---
src/util/virvsock.c | 4 ++--
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/meson.build b/meson.build
index 612257a351..95bc89ec52 100644
--- a/meson.build
+++ b/meson.build
@@ -646,9 +646,6 @@ symbols = [
if host_machine.system() == 'linux'
symbols += [
- # check for VHOST_VSOCK_SET_GUEST_CID
- [ 'linux/vhost.h', 'VHOST_VSOCK_SET_GUEST_CID' ],
-
# Check if we have new enough kernel to support BPF devices for cgroups v2
[ 'linux/bpf.h', 'BPF_PROG_QUERY' ],
[ 'linux/bpf.h', 'BPF_CGROUP_DEVICE' ],
diff --git a/src/util/virvsock.c b/src/util/virvsock.c
index 4bbbf78167..c6f8b362b8 100644
--- a/src/util/virvsock.c
+++ b/src/util/virvsock.c
@@ -21,7 +21,7 @@
# include <sys/ioctl.h>
#endif
-#if WITH_DECL_VHOST_VSOCK_SET_GUEST_CID
+#ifdef __linux__
# include <linux/vhost.h>
#endif
@@ -35,7 +35,7 @@
VIR_LOG_INIT("util.vsock");
-#if WITH_DECL_VHOST_VSOCK_SET_GUEST_CID
+#ifdef __linux__
static int
virVsockSetGuestCidQuiet(int fd,
unsigned int guest_cid)
--
2.38.1