@@ -10,7 +10,7 @@ obj-$(CONFIG_LINUX) += vhost.o vhost-backend.o vhost-user.o
obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock.o
obj-y += virtio-crypto.o
obj-$(CONFIG_VIRTIO_PCI) += virtio-crypto-pci.o
-endif
-
+else
common-obj-$(call lnot,$(CONFIG_LINUX)) += vhost-stub.o
-common-obj-$(CONFIG_ALL) += vhost-stub.o
+common-obj-y += vhost-stub.o
+endif
@@ -1,7 +1,18 @@
#include "qemu/osdep.h"
#include "hw/virtio/vhost.h"
+#include "hw/virtio/vhost-user.h"
bool vhost_has_free_slot(void)
{
return true;
}
+
+void vhost_user_asyn_read(void *opaque, const uint8_t *buf, int size)
+{
+ return;
+}
+
+int vhost_user_can_read(void *opaque)
+{
+ return 0;
+}
@@ -14,7 +14,7 @@
#include "hw/virtio/vhost-backend.h"
#include "hw/virtio/vhost-user.h"
#include "hw/virtio/virtio-net.h"
-#include "sysemu/char.h"
+#include "net/vhost-user.h"
#include "sysemu/kvm.h"
#include "qemu/error-report.h"
#include "qemu/sockets.h"
@@ -75,6 +75,46 @@ fail:
return -1;
}
+int vhost_user_can_read(void *opaque)
+{
+ return VHOST_USER_HDR_SIZE;
+}
+
+void vhost_user_asyn_read(void *opaque, const uint8_t *buf, int size)
+{
+ const char *name = opaque;
+ VhostUserMsg msg;
+ uint8_t *p = (uint8_t *) &msg;
+ CharBackend *chr_be = net_name_to_chr_be(name);
+
+ if (size != VHOST_USER_HDR_SIZE) {
+ error_report("%s: wrong message size received %d", __func__, size);
+ return;
+ }
+
+ memcpy(p, buf, VHOST_USER_HDR_SIZE);
+
+ if (msg.size) {
+ p += VHOST_USER_HDR_SIZE;
+ size = qemu_chr_fe_read_all(chr_be, p, msg.size);
+ if (size != msg.size) {
+ error_report("%s: wrong message size %d != %d", __func__,
+ size, msg.size);
+ return;
+ }
+ }
+
+ if (msg.request > VHOST_USER_MAX) {
+ error_report("%s:incorrect msg %d", __func__, msg.request);
+ }
+
+ switch (msg.request) {
+ default:
+ error_report("%s: does not support msg %d", __func__, msg.request);
+ break;
+ }
+}
+
static int process_message_reply(struct vhost_dev *dev,
VhostUserRequest request)
{
@@ -103,4 +103,8 @@ static VhostUserMsg m __attribute__ ((unused));
/* The version of the protocol we support */
#define VHOST_USER_VERSION (0x1)
+int vhost_user_can_read(void *opaque);
+
+void vhost_user_asyn_read(void *opaque, const uint8_t *buf, int size);
+
#endif
@@ -11,8 +11,12 @@
#ifndef NET_VHOST_USER_H
#define NET_VHOST_USER_H
+#include "sysemu/char.h"
+
struct vhost_net;
struct vhost_net *vhost_user_get_vhost_net(NetClientState *nc);
uint64_t vhost_user_get_acked_features(NetClientState *nc);
+CharBackend *net_name_to_chr_be(const char *name);
+
#endif /* VHOST_USER_H */
@@ -12,7 +12,7 @@
#include "clients.h"
#include "net/vhost_net.h"
#include "net/vhost-user.h"
-#include "sysemu/char.h"
+#include "hw/virtio/vhost-user.h"
#include "qemu/config-file.h"
#include "qemu/error-report.h"
#include "qmp-commands.h"
@@ -221,6 +221,22 @@ static void chr_closed_bh(void *opaque)
}
}
+CharBackend *net_name_to_chr_be(const char *name)
+{
+ NetClientState *ncs[MAX_QUEUE_NUM];
+ VhostUserState *s;
+ int queues;
+
+ queues = qemu_find_net_clients_except(name, ncs,
+ NET_CLIENT_DRIVER_NIC,
+ MAX_QUEUE_NUM);
+ assert(queues < MAX_QUEUE_NUM);
+
+ s = DO_UPCAST(VhostUserState, nc, ncs[0]);
+
+ return &s->chr;
+}
+
static void net_vhost_user_event(void *opaque, int event)
{
const char *name = opaque;
@@ -307,8 +323,9 @@ static int net_vhost_user_init(NetClientState *peer, const char *device,
error_report_err(err);
return -1;
}
- qemu_chr_fe_set_handlers(&s->chr, NULL, NULL,
- net_vhost_user_event, nc0->name, NULL, true);
+ qemu_chr_fe_set_handlers(&s->chr, vhost_user_can_read,
+ vhost_user_asyn_read, net_vhost_user_event,
+ nc0->name, NULL, true);
} while (!s->started);
assert(s->vhost_net);
Enable the vhost-user master to asynchronously receive messages from the slave. The vhost_user_asyn_read and vhost_user_can_read stub functions are defined for platforms that do not support the use of virtio. Signed-off-by: Wei Wang <wei.w.wang@intel.com> --- hw/virtio/Makefile.objs | 6 +++--- hw/virtio/vhost-stub.c | 11 +++++++++++ hw/virtio/vhost-user.c | 42 +++++++++++++++++++++++++++++++++++++++++- include/hw/virtio/vhost-user.h | 4 ++++ include/net/vhost-user.h | 4 ++++ net/vhost-user.c | 23 ++++++++++++++++++++--- 6 files changed, 83 insertions(+), 7 deletions(-)