[Date Prev] | [Thread Prev] | [Thread Next] | [Date Next] -- [Date Index] | [Thread Index] | [List Home]
Subject: [PATCH v1 07/37] vhost-pci-slave/msg: VHOST_USER_GET_FEATURES
Offer the initial feature bits, which haven't been negotiated with the slave driver, to the master. Signed-off-by: Wei Wang <wei.w.wang@intel.com> --- hw/virtio/vhost-pci-slave.c | 42 +++++++++++++++++++++++++++++++++++++ include/hw/virtio/vhost-pci-slave.h | 1 + 2 files changed, 43 insertions(+) diff --git a/hw/virtio/vhost-pci-slave.c b/hw/virtio/vhost-pci-slave.c index 2278f63..4f445c2 100644 --- a/hw/virtio/vhost-pci-slave.c +++ b/hw/virtio/vhost-pci-slave.c @@ -14,11 +14,42 @@ #include "qapi/error.h" #include "qemu/error-report.h" +#include "hw/virtio/virtio-pci.h" #include "hw/virtio/vhost-pci-slave.h" #include "hw/virtio/vhost-user.h" +#define VHOST_PCI_FEATURE_BITS (1ULL << VIRTIO_F_VERSION_1) + +#define VHOST_PCI_NET_FEATURE_BITS (1ULL << VIRTIO_NET_F_MRG_RXBUF) | \ + (1ULL << VIRTIO_NET_F_CTRL_VQ) | \ + (1ULL << VIRTIO_NET_F_MQ) + VhostPCISlave *vp_slave; +static int vp_slave_write(CharBackend *chr_be, VhostUserMsg *msg) +{ + int size; + + if (!msg) + return 0; + + size = msg->size + VHOST_USER_HDR_SIZE; + msg->flags &= ~VHOST_USER_VERSION_MASK; + msg->flags |= VHOST_USER_VERSION; + + return qemu_chr_fe_write_all(chr_be, (const uint8_t *)msg, size) + == size ? 0 : -1; +} + +static int vp_slave_get_features(CharBackend *chr_be, VhostUserMsg *msg) +{ + msg->payload.u64 = vp_slave->feature_bits; + msg->size = sizeof(msg->payload.u64); + msg->flags |= VHOST_USER_REPLY_MASK; + + return vp_slave_write(chr_be, msg); +} + static void vp_slave_event(void *opaque, int event) { switch (event) { @@ -36,6 +67,7 @@ static int vp_slave_can_read(void *opaque) static void vp_slave_read(void *opaque, const uint8_t *buf, int size) { + int ret; VhostUserMsg msg; uint8_t *p = (uint8_t *) &msg; CharBackend *chr_be = (CharBackend *)opaque; @@ -61,11 +93,20 @@ static void vp_slave_read(void *opaque, const uint8_t *buf, int size) error_report("vhost-pci-slave read incorrect msg"); switch(msg.request) { + case VHOST_USER_GET_FEATURES: + ret = vp_slave_get_features(chr_be, &msg); + if (ret < 0) + goto err_handling; + break; default: error_report("vhost-pci-slave does not support msg request = %d", msg.request); break; } + return; + +err_handling: + error_report("vhost-pci-slave handle request %d failed", msg.request); } static CharDriverState *vp_slave_parse_chardev(const char *id) @@ -89,6 +130,7 @@ int vhost_pci_slave_init(QemuOpts *opts) if (!chr) { return -1; } + vp_slave->feature_bits = 1ULL << VHOST_USER_F_PROTOCOL_FEATURES; qemu_chr_fe_init(&vp_slave->chr_be, chr, &error_abort); qemu_chr_fe_set_handlers(&vp_slave->chr_be, vp_slave_can_read, vp_slave_read, vp_slave_event, diff --git a/include/hw/virtio/vhost-pci-slave.h b/include/hw/virtio/vhost-pci-slave.h index c82c775..4ec25d4 100644 --- a/include/hw/virtio/vhost-pci-slave.h +++ b/include/hw/virtio/vhost-pci-slave.h @@ -5,6 +5,7 @@ typedef struct VhostPCISlave { CharBackend chr_be; + uint64_t feature_bits; } VhostPCISlave; extern VhostPCISlave *vp_slave; -- 2.7.4
[Date Prev] | [Thread Prev] | [Thread Next] | [Date Next] -- [Date Index] | [Thread Index] | [List Home]