[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 09/14] vhost: implement vhost_vq_get_addr method
From: |
Cindy Lu |
Subject: |
[PATCH v4 09/14] vhost: implement vhost_vq_get_addr method |
Date: |
Wed, 1 Jul 2020 22:55:33 +0800 |
use vhost_vq_get_addr callback to get the vq address from backend
Signed-off-by: Cindy Lu <lulu@redhat.com>
---
hw/virtio/vhost.c | 28 +++++++++++++++++++---------
include/hw/virtio/vhost-backend.h | 4 ++++
2 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index 32809e54b5..1e083a8976 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -773,15 +773,25 @@ static int vhost_virtqueue_set_addr(struct vhost_dev *dev,
struct vhost_virtqueue *vq,
unsigned idx, bool enable_log)
{
- struct vhost_vring_addr addr = {
- .index = idx,
- .desc_user_addr = (uint64_t)(unsigned long)vq->desc,
- .avail_user_addr = (uint64_t)(unsigned long)vq->avail,
- .used_user_addr = (uint64_t)(unsigned long)vq->used,
- .log_guest_addr = vq->used_phys,
- .flags = enable_log ? (1 << VHOST_VRING_F_LOG) : 0,
- };
- int r = dev->vhost_ops->vhost_set_vring_addr(dev, &addr);
+ struct vhost_vring_addr addr;
+ int r;
+ memset(&addr, 0, sizeof(struct vhost_vring_addr));
+
+ if (dev->vhost_ops->vhost_vq_get_addr) {
+ r = dev->vhost_ops->vhost_vq_get_addr(dev, &addr, vq);
+ if (r < 0) {
+ VHOST_OPS_DEBUG("vhost_vq_get_addr failed");
+ return -errno;
+ }
+ } else {
+ addr.desc_user_addr = (uint64_t)(unsigned long)vq->desc;
+ addr.avail_user_addr = (uint64_t)(unsigned long)vq->avail;
+ addr.used_user_addr = (uint64_t)(unsigned long)vq->used;
+ }
+ addr.index = idx;
+ addr.log_guest_addr = vq->used_phys;
+ addr.flags = enable_log ? (1 << VHOST_VRING_F_LOG) : 0;
+ r = dev->vhost_ops->vhost_set_vring_addr(dev, &addr);
if (r < 0) {
VHOST_OPS_DEBUG("vhost_set_vring_addr failed");
return -errno;
diff --git a/include/hw/virtio/vhost-backend.h
b/include/hw/virtio/vhost-backend.h
index fa84abac97..bfc24207e2 100644
--- a/include/hw/virtio/vhost-backend.h
+++ b/include/hw/virtio/vhost-backend.h
@@ -118,6 +118,9 @@ typedef int (*vhost_dev_start_op)(struct vhost_dev *dev,
bool started);
typedef int (*vhost_vq_get_addr_op)(struct vhost_dev *dev,
struct vhost_vring_addr *addr,
struct vhost_virtqueue *vq);
+
+typedef int (*vhost_get_device_id_op)(struct vhost_dev *dev, uint32_t *dev_id);
+
typedef struct VhostOps {
VhostBackendType backend_type;
vhost_backend_init vhost_backend_init;
@@ -160,6 +163,7 @@ typedef struct VhostOps {
vhost_set_inflight_fd_op vhost_set_inflight_fd;
vhost_dev_start_op vhost_dev_start;
vhost_vq_get_addr_op vhost_vq_get_addr;
+ vhost_get_device_id_op vhost_get_device_id;
} VhostOps;
extern const VhostOps user_ops;
--
2.21.1
- [PATCH v4 00/14]vDPA support in qemu, Cindy Lu, 2020/07/01
- [PATCH v4 01/14] net: introduce qemu_get_peer, Cindy Lu, 2020/07/01
- [PATCH v4 02/14] vhost_net: use the function qemu_get_peer, Cindy Lu, 2020/07/01
- [PATCH v4 03/14] virtio-bus: introduce queue_enabled method, Cindy Lu, 2020/07/01
- [PATCH v4 04/14] virtio-pci: implement queue_enabled method, Cindy Lu, 2020/07/01
- [PATCH v4 05/14] vhost: check the existence of vhost_set_iotlb_callback, Cindy Lu, 2020/07/01
- [PATCH v4 06/14] vhost: introduce new VhostOps vhost_dev_start, Cindy Lu, 2020/07/01
- [PATCH v4 07/14] vhost: implement vhost_dev_start method, Cindy Lu, 2020/07/01
- [PATCH v4 08/14] vhost: introduce new VhostOps vhost_vq_get_addr, Cindy Lu, 2020/07/01
- [PATCH v4 09/14] vhost: implement vhost_vq_get_addr method,
Cindy Lu <=
- [PATCH v4 10/14] vhost: introduce new VhostOps vhost_force_iommu, Cindy Lu, 2020/07/01
- [PATCH v4 11/14] vhost: implement vhost_force_iommu method, Cindy Lu, 2020/07/01
- [PATCH v4 12/14] vhost_net: introduce set_config & get_config, Cindy Lu, 2020/07/01
- [PATCH v4 14/14] vhost-vdpa: introduce vhost-vdpa net client, Cindy Lu, 2020/07/01
- [PATCH v4 13/14] vhost-vdpa: introduce vhost-vdpa backend, Cindy Lu, 2020/07/01
- Re: [PATCH v4 00/14]vDPA support in qemu, Jason Wang, 2020/07/03