[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 09/12] vhost: implement vhost_vq_get_addr method
From: |
Cindy Lu |
Subject: |
[PATCH v2 09/12] vhost: implement vhost_vq_get_addr method |
Date: |
Wed, 1 Jul 2020 01:49: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 +++++++++++++++++++---------
1 file changed, 19 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;
--
2.21.1
- [PATCH v2 00/12] vDPA support in qemu, Cindy Lu, 2020/06/30
- [PATCH v2 01/12] net: introduce qemu_get_peer, Cindy Lu, 2020/06/30
- [PATCH v2 02/12] vhost_net: use the function qemu_get_peer, Cindy Lu, 2020/06/30
- [PATCH v2 03/12] virtio-bus: introduce queue_enabled method, Cindy Lu, 2020/06/30
- [PATCH v2 04/12] virtio-pci: implement queue_enabled method, Cindy Lu, 2020/06/30
- [PATCH v2 05/12] vhost: check the existence of vhost_set_iotlb_callback, Cindy Lu, 2020/06/30
- [PATCH v2 06/12] vhost: introduce new VhostOps vhost_dev_start, Cindy Lu, 2020/06/30
- [PATCH v2 07/12] vhost: implement vhost_dev_start method, Cindy Lu, 2020/06/30
- [PATCH v2 08/12] vhost: introduce new VhostOps vhost_vq_get_addr, Cindy Lu, 2020/06/30
- [PATCH v2 09/12] vhost: implement vhost_vq_get_addr method,
Cindy Lu <=
- [PATCH v2 10/12] vhost: introduce new VhostOps vhost_get_device_id, Cindy Lu, 2020/06/30
- [PATCH v2 11/12] vhost-vdpa: introduce vhost-vdpa backend, Cindy Lu, 2020/06/30
- [PATCH v2 12/12] vhost-vdpa: introduce vhost-vdpa net client, Cindy Lu, 2020/06/30
- Re: [PATCH v2 00/12] vDPA support in qemu, no-reply, 2020/06/30