qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Jason Wang <jasowang@redhat.com>
To: qemu-devel@nongnu.org, peter.maydell@linaro.org
Cc: "Eugenio Pérez" <eperezma@redhat.com>,
	"Jason Wang" <jasowang@redhat.com>
Subject: [PULL 07/21] vdpa: Use ring hwaddr at vhost_vdpa_svq_unmap_ring
Date: Fri,  2 Sep 2022 14:41:24 +0800	[thread overview]
Message-ID: <20220902064138.56468-8-jasowang@redhat.com> (raw)
In-Reply-To: <20220902064138.56468-1-jasowang@redhat.com>

From: Eugenio Pérez <eperezma@redhat.com>

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>
---
 hw/virtio/vhost-vdpa.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
index e208dd0..23ae5ef 100644
--- a/hw/virtio/vhost-vdpa.c
+++ b/hw/virtio/vhost-vdpa.c
@@ -884,10 +884,12 @@ static int vhost_vdpa_svq_set_fds(struct vhost_dev *dev,
 /**
  * Unmap a SVQ area in the device
  */
-static void vhost_vdpa_svq_unmap_ring(struct vhost_vdpa *v,
-                                      const DMAMap *needle)
+static void vhost_vdpa_svq_unmap_ring(struct vhost_vdpa *v, hwaddr addr)
 {
-    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;
     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,
                                        const VhostShadowVirtqueue *svq)
 {
-    DMAMap needle = {};
     struct vhost_vdpa *v = dev->opaque;
     struct vhost_vring_addr svq_addr;
 
     vhost_svq_get_vring_addr(svq, &svq_addr);
 
-    needle.translated_addr = svq_addr.desc_user_addr;
-    vhost_vdpa_svq_unmap_ring(v, &needle);
+    vhost_vdpa_svq_unmap_ring(v, svq_addr.desc_user_addr);
 
-    needle.translated_addr = svq_addr.used_user_addr;
-    vhost_vdpa_svq_unmap_ring(v, &needle);
+    vhost_vdpa_svq_unmap_ring(v, svq_addr.used_user_addr);
 }
 
 /**
@@ -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);
     if (unlikely(!ok)) {
         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;
 
-- 
2.7.4



  parent reply	other threads:[~2022-09-02  6:57 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-02  6:41 [PULL 00/21] Net patches Jason Wang
2022-09-02  6:41 ` [PULL 01/21] vdpa: Skip the maps not in the iova tree Jason Wang
2022-09-02  6:41 ` [PULL 02/21] vdpa: do not save failed dma maps in SVQ " Jason Wang
2022-09-02  6:41 ` [PULL 03/21] util: accept iova_tree_remove_parameter by value Jason Wang
2022-09-02  6:41 ` [PULL 04/21] vdpa: Remove SVQ vring from iova_tree at shutdown Jason Wang
2022-09-02  6:41 ` [PULL 05/21] vdpa: Make SVQ vring unmapping return void Jason Wang
2022-09-02  6:41 ` [PULL 06/21] vhost: Always store new kick fd on vhost_svq_set_svq_kick_fd Jason Wang
2022-09-02  6:41 ` Jason Wang [this message]
2022-09-02  6:41 ` [PULL 08/21] vhost: stop transfer elem ownership in vhost_handle_guest_kick Jason Wang
2022-09-02  6:41 ` [PULL 09/21] vhost: use SVQ element ndescs instead of opaque data for desc validation Jason Wang
2022-09-02  6:41 ` [PULL 10/21] vhost: Delete useless read memory barrier Jason Wang
2022-09-02  6:41 ` [PULL 11/21] vhost: Do not depend on !NULL VirtQueueElement on vhost_svq_flush Jason Wang
2022-09-02  6:41 ` [PULL 12/21] vhost_net: Add NetClientInfo start callback Jason Wang
2022-09-02  6:41 ` [PULL 13/21] vhost_net: Add NetClientInfo stop callback Jason Wang
2022-09-02  6:41 ` [PULL 14/21] vdpa: add net_vhost_vdpa_cvq_info NetClientInfo Jason Wang
2022-09-02  6:41 ` [PULL 15/21] vdpa: Move command buffers map to start of net device Jason Wang
2022-09-02  6:41 ` [PULL 16/21] vdpa: extract vhost_vdpa_net_cvq_add from vhost_vdpa_net_handle_ctrl_avail Jason Wang
2022-09-02  6:41 ` [PULL 17/21] vhost_net: add NetClientState->load() callback Jason Wang
2022-09-02  6:41 ` [PULL 18/21] vdpa: Add virtio-net mac address via CVQ at start Jason Wang
2022-09-02  6:41 ` [PULL 19/21] vdpa: Delete CVQ migration blocker Jason Wang
2022-09-02  6:41 ` [PULL 20/21] net/colo.c: Fix the pointer issue reported by Coverity Jason Wang
2022-09-02  6:41 ` [PULL 21/21] net: tulip: Restrict DMA engine to memories Jason Wang
2022-09-02 20:33 ` [PULL 00/21] Net patches Stefan Hajnoczi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220902064138.56468-8-jasowang@redhat.com \
    --to=jasowang@redhat.com \
    --cc=eperezma@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).