[Date Prev] | [Thread Prev] | [Thread Next] | [Date Next] -- [Date Index] | [Thread Index] | [List Home]
Subject: [RESEND Patch v1 29/37] vhost-pci-slave/msg: VHOST_USER_SET_VHOST_PCI (start)
The VHOST_USER_SET_VHOST_PCI msg is used to request the start or stop of the vhost-pci device. This patch handles the start commandin the slave. When receiving the SET_VHOST_PCI request with the start command, the slave creates a vhost-pci device based on the previously received virtio_id. Signed-off-by: Wei Wang <wei.w.wang@intel.com> --- hw/virtio/vhost-pci-slave.c | 53 ++++++++++++++++++++++++++++++++++++++++++ include/hw/virtio/vhost-user.h | 5 ++++ 2 files changed, 58 insertions(+) diff --git a/hw/virtio/vhost-pci-slave.c b/hw/virtio/vhost-pci-slave.c index ff9a251..5c16365 100644 --- a/hw/virtio/vhost-pci-slave.c +++ b/hw/virtio/vhost-pci-slave.c @@ -13,6 +13,7 @@ #include <qemu/osdep.h> #include <qemu/sockets.h> +#include "monitor/qdev.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "hw/virtio/virtio-pci.h" @@ -267,6 +268,52 @@ static void vp_slave_set_vring_enable(VhostUserMsg *msg) } } +static int vp_slave_device_create(uint16_t virtio_id) +{ + Error *local_err = NULL; + QemuOpts *opts; + DeviceState *dev; + char params[50]; + + switch (virtio_id) { + case VIRTIO_ID_NET: + strcpy(params, "driver=vhost-pci-net-pci,id=vhost-pci-0"); + break; + default: + error_report("vhost-pci device create: device type %d not supported", + virtio_id); + } + + opts = qemu_opts_parse_noisily(qemu_find_opts("device"), params, true); + dev = qdev_device_add(opts, &local_err); + if (!dev) { + qemu_opts_del(opts); + return -1; + } + object_unref(OBJECT(dev)); + return 0; +} + +static int vp_slave_set_vhost_pci(CharBackend *chr_be, VhostUserMsg *msg) +{ + int ret; + uint8_t cmd = (uint8_t)msg->payload.u64; + + switch (cmd) { + case VHOST_USER_SET_VHOST_PCI_start: + ret = vp_slave_device_create(vp_slave->dev_type); + if (ret < 0) { + return ret; + } + break; + default: + error_report("slave pconnection: cmd %d not supported yet", cmd); + return -1; + } + + return ret; +} + static int vp_slave_can_read(void *opaque) { return VHOST_USER_HDR_SIZE; @@ -382,6 +429,12 @@ static void vp_slave_read(void *opaque, const uint8_t *buf, int size) break; case VHOST_USER_SEND_RARP: break; + case VHOST_USER_SET_VHOST_PCI: + ret = vp_slave_set_vhost_pci(chr_be, &msg); + if (ret < 0) { + goto err_handling; + } + break; default: error_report("vhost-pci-slave does not support msg request = %d", msg.request); diff --git a/include/hw/virtio/vhost-user.h b/include/hw/virtio/vhost-user.h index e79a2ec..bf8c6ee 100644 --- a/include/hw/virtio/vhost-user.h +++ b/include/hw/virtio/vhost-user.h @@ -25,6 +25,10 @@ enum VhostUserProtocolFeature { (1ULL << VHOST_USER_PROTOCOL_F_VHOST_PCI) | \ (1ULL << VHOST_USER_PROTOCOL_F_SET_DEVICE_ID)) +/* control/status of the vhost-pci device */ +#define VHOST_USER_SET_VHOST_PCI_start 0 +#define VHOST_USER_SET_VHOST_PCI_stop 1 + typedef enum VhostUserRequest { VHOST_USER_NONE = 0, VHOST_USER_GET_FEATURES = 1, @@ -47,6 +51,7 @@ typedef enum VhostUserRequest { VHOST_USER_SET_VRING_ENABLE = 18, VHOST_USER_SEND_RARP = 19, VHOST_USER_SET_DEVICE_ID = 20, + VHOST_USER_SET_VHOST_PCI = 21, VHOST_USER_MAX } VhostUserRequest; -- 2.7.4
[Date Prev] | [Thread Prev] | [Thread Next] | [Date Next] -- [Date Index] | [Thread Index] | [List Home]