[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 6/9] vhost-user: enable frontends on any POSIX system
From: |
Stefano Garzarella |
Subject: |
[PATCH 6/9] vhost-user: enable frontends on any POSIX system |
Date: |
Wed, 28 Feb 2024 12:47:56 +0100 |
The vhost-user protocol is not really Linux-specific so let's enable
vhost-user frontends for any POSIX system.
In vhost_net.c we use VHOST_FILE_UNBIND which is defined in a Linux
specific header, let's define it for other systems as well.
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
---
If we want to be more conservative, maybe we can leave `have_vhost_user`
auto only on linux. I removed it more to test with CI if we have any
problems in the other POSIX systems.
In hw/net/vhost_net.c maybe we can just do:
#ifndef VHOST_FILE_UNBIND
#define VHOST_FILE_UNBIND -1
#endif
Any suggestion?
Thanks,
Stefano
---
meson.build | 1 -
hw/net/vhost_net.c | 8 +++++++-
hw/block/Kconfig | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/meson.build b/meson.build
index 0ef1654e86..462f2d7593 100644
--- a/meson.build
+++ b/meson.build
@@ -151,7 +151,6 @@ have_tpm = get_option('tpm') \
# vhost
have_vhost_user = get_option('vhost_user') \
- .disable_auto_if(host_os != 'linux') \
.require(host_os != 'windows',
error_message: 'vhost-user is not available on Windows').allowed()
have_vhost_vdpa = get_option('vhost_vdpa') \
diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
index e8e1661646..346ef74eb1 100644
--- a/hw/net/vhost_net.c
+++ b/hw/net/vhost_net.c
@@ -34,8 +34,14 @@
#include "standard-headers/linux/virtio_ring.h"
#include "hw/virtio/vhost.h"
#include "hw/virtio/virtio-bus.h"
-#include "linux-headers/linux/vhost.h"
+#if defined(__linux__)
+#include "linux-headers/linux/vhost.h"
+#else
+#ifndef VHOST_FILE_UNBIND
+#define VHOST_FILE_UNBIND -1
+#endif
+#endif
/* Features supported by host kernel. */
static const int kernel_feature_bits[] = {
diff --git a/hw/block/Kconfig b/hw/block/Kconfig
index 9e8f28f982..29ee09e434 100644
--- a/hw/block/Kconfig
+++ b/hw/block/Kconfig
@@ -40,7 +40,7 @@ config VHOST_USER_BLK
bool
# Only PCI devices are provided for now
default y if VIRTIO_PCI
- depends on VIRTIO && VHOST_USER && LINUX
+ depends on VIRTIO && VHOST_USER
config SWIM
bool
--
2.43.2
- [PATCH 0/9] vhost-user: support any POSIX system (tested on macOS and FreeBSD), Stefano Garzarella, 2024/02/28
- [PATCH 1/9] libvhost-user: set msg.msg_control to NULL when it is empty, Stefano Garzarella, 2024/02/28
- [PATCH 2/9] libvhost-user: fail vu_message_write() if sendmsg() is failing, Stefano Garzarella, 2024/02/28
- [PATCH 4/9] vhost-user-server: don't abort if we can't set fd non-blocking, Stefano Garzarella, 2024/02/28
- [PATCH 3/9] libvhost-user: mask F_INFLIGHT_SHMFD if memfd is not supported, Stefano Garzarella, 2024/02/28
- [PATCH 5/9] contrib/vhost-user-blk: fix bind() using the right size of the address, Stefano Garzarella, 2024/02/28
- [PATCH 6/9] vhost-user: enable frontends on any POSIX system,
Stefano Garzarella <=
- [PATCH 7/9] libvhost-user: enable it on any POSIX system, Stefano Garzarella, 2024/02/28
- [PATCH 8/9] contrib/vhost-user-blk: enabled it on any POSIX system, Stefano Garzarella, 2024/02/28
- [PATCH 9/9] hostmem-file: support POSIX shm_open(), Stefano Garzarella, 2024/02/28