From: Stefano Garzarella <sgarzare@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Coiby Xu" <Coiby.Xu@gmail.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
qemu-block@nongnu.org, "Daniel P. Berrangé" <berrange@redhat.com>,
slp@redhat.com, "Eduardo Habkost" <eduardo@habkost.net>,
"Kevin Wolf" <kwolf@redhat.com>,
"Hanna Reitz" <hreitz@redhat.com>,
"Igor Mammedov" <imammedo@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Raphael Norwitz" <raphael@enfabrica.net>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Brad Smith" <brad@comstyle.com>,
stefanha@redhat.com, "Eric Blake" <eblake@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Laurent Vivier" <lvivier@redhat.com>,
"David Hildenbrand" <david@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
gmaglione@redhat.com, "Jason Wang" <jasowang@redhat.com>,
"Stefano Garzarella" <sgarzare@redhat.com>
Subject: [PATCH for-9.1 v3 06/11] vhost-user: enable frontends on any POSIX system
Date: Thu, 4 Apr 2024 14:23:25 +0200 [thread overview]
Message-ID: <20240404122330.92710-7-sgarzare@redhat.com> (raw)
In-Reply-To: <20240404122330.92710-1-sgarzare@redhat.com>
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>
---
meson.build | 1 -
hw/net/vhost_net.c | 5 +++++
hw/block/Kconfig | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index c9c3217ba4..c19d51501a 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 fd1a93701a..fced429813 100644
--- a/hw/net/vhost_net.c
+++ b/hw/net/vhost_net.c
@@ -34,8 +34,13 @@
#include "standard-headers/linux/virtio_ring.h"
#include "hw/virtio/vhost.h"
#include "hw/virtio/virtio-bus.h"
+#if defined(__linux__)
#include "linux-headers/linux/vhost.h"
+#endif
+#ifndef VHOST_FILE_UNBIND
+#define VHOST_FILE_UNBIND -1
+#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.44.0
next prev parent reply other threads:[~2024-04-04 12:26 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-04 12:23 [PATCH for-9.1 v3 00/11] vhost-user: support any POSIX system (tested on macOS, FreeBSD, OpenBSD) Stefano Garzarella
2024-04-04 12:23 ` [PATCH for-9.1 v3 01/11] libvhost-user: set msg.msg_control to NULL when it is empty Stefano Garzarella
2024-04-04 13:55 ` Philippe Mathieu-Daudé
2024-04-04 12:23 ` [PATCH for-9.1 v3 02/11] libvhost-user: fail vu_message_write() if sendmsg() is failing Stefano Garzarella
2024-04-04 12:23 ` [PATCH for-9.1 v3 03/11] libvhost-user: mask F_INFLIGHT_SHMFD if memfd is not supported Stefano Garzarella
2024-04-04 12:23 ` [PATCH for-9.1 v3 04/11] vhost-user-server: do not set memory fd non-blocking Stefano Garzarella
2024-04-04 12:23 ` [PATCH for-9.1 v3 05/11] contrib/vhost-user-blk: fix bind() using the right size of the address Stefano Garzarella
2024-04-04 13:56 ` Philippe Mathieu-Daudé
2024-04-04 12:23 ` Stefano Garzarella [this message]
2024-04-04 12:23 ` [PATCH for-9.1 v3 07/11] libvhost-user: enable it on any POSIX system Stefano Garzarella
2024-04-04 12:23 ` [PATCH for-9.1 v3 08/11] contrib/vhost-user-blk: " Stefano Garzarella
2024-04-04 14:00 ` Philippe Mathieu-Daudé
2024-04-08 7:41 ` Stefano Garzarella
2024-04-04 12:23 ` [PATCH for-9.1 v3 09/11] hostmem: add a new memory backend based on POSIX shm_open() Stefano Garzarella
2024-04-04 14:09 ` David Hildenbrand
2024-04-08 7:58 ` Stefano Garzarella
2024-04-08 8:03 ` David Hildenbrand
2024-04-08 8:14 ` Stefano Garzarella
2024-04-04 12:23 ` [PATCH for-9.1 v3 10/11] tests/qtest/vhost-user-blk-test: use memory-backend-shm Stefano Garzarella
2024-04-04 12:23 ` [PATCH for-9.1 v3 11/11] tests/qtest/vhost-user-test: add a test case for memory-backend-shm Stefano Garzarella
2024-04-08 8:00 ` [PATCH for-9.1 v3 00/11] vhost-user: support any POSIX system (tested on macOS, FreeBSD, OpenBSD) Stefano Garzarella
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240404122330.92710-7-sgarzare@redhat.com \
--to=sgarzare@redhat.com \
--cc=Coiby.Xu@gmail.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=brad@comstyle.com \
--cc=david@redhat.com \
--cc=eblake@redhat.com \
--cc=eduardo@habkost.net \
--cc=gmaglione@redhat.com \
--cc=hreitz@redhat.com \
--cc=imammedo@redhat.com \
--cc=jasowang@redhat.com \
--cc=kwolf@redhat.com \
--cc=lvivier@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=raphael@enfabrica.net \
--cc=slp@redhat.com \
--cc=stefanha@redhat.com \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).