ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vdpa: Use ring hwaddr at vhost_vdpa_svq_unmap_ring 

Reduce code duplication.

Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
Eugenio Pérez 2022-08-23 20:20:08 +02:00 committed by Jason Wang
parent 8b64e48642
commit 8b6d6119ad
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hw/virtio/vhost-vdpa.c
View File

@ -884,10 +884,12 @@ static int vhost_vdpa_svq_set_fds(struct vhost_dev *dev,
/** /**
* Unmap a SVQ area in the device * Unmap a SVQ area in the device
*/ */
static void vhost_vdpa_svq_unmap_ring(struct vhost_vdpa *v, static void vhost_vdpa_svq_unmap_ring(struct vhost_vdpa *v, hwaddr addr)
const DMAMap *needle)
{ {
const DMAMap *result = vhost_iova_tree_find_iova(v->iova_tree, needle); const DMAMap needle = {
.translated_addr = addr,
};
const DMAMap *result = vhost_iova_tree_find_iova(v->iova_tree, &needle);
hwaddr size; hwaddr size;
int r; int r;
@ -909,17 +911,14 @@ static void vhost_vdpa_svq_unmap_ring(struct vhost_vdpa *v,
static void vhost_vdpa_svq_unmap_rings(struct vhost_dev *dev, static void vhost_vdpa_svq_unmap_rings(struct vhost_dev *dev,
const VhostShadowVirtqueue *svq) const VhostShadowVirtqueue *svq)
{ {
DMAMap needle = {};
struct vhost_vdpa *v = dev->opaque; struct vhost_vdpa *v = dev->opaque;
struct vhost_vring_addr svq_addr; struct vhost_vring_addr svq_addr;
vhost_svq_get_vring_addr(svq, &svq_addr); vhost_svq_get_vring_addr(svq, &svq_addr);
needle.translated_addr = svq_addr.desc_user_addr; vhost_vdpa_svq_unmap_ring(v, svq_addr.desc_user_addr);
vhost_vdpa_svq_unmap_ring(v, &needle);
needle.translated_addr = svq_addr.used_user_addr; vhost_vdpa_svq_unmap_ring(v, svq_addr.used_user_addr);
vhost_vdpa_svq_unmap_ring(v, &needle);
} }
/** /**
@ -997,7 +996,7 @@ static bool vhost_vdpa_svq_map_rings(struct vhost_dev *dev,
ok = vhost_vdpa_svq_map_ring(v, &device_region, errp); ok = vhost_vdpa_svq_map_ring(v, &device_region, errp);
if (unlikely(!ok)) { if (unlikely(!ok)) {
error_prepend(errp, "Cannot create vq device region: "); error_prepend(errp, "Cannot create vq device region: ");
vhost_vdpa_svq_unmap_ring(v, &driver_region); vhost_vdpa_svq_unmap_ring(v, driver_region.translated_addr);
} }
addr->used_user_addr = device_region.iova; addr->used_user_addr = device_region.iova;