All of lore.kernel.org
 help / color / mirror / Atom feed
From: Cindy Lu <lulu@redhat.com>
To: mst@redhat.com, armbru@redhat.com, eblake@redhat.com,
	cohuck@redhat.com, jasowang@redhat.com
Cc: mhabets@solarflare.com, qemu-devel@nongnu.org,
	rob.miller@broadcom.com, saugatm@xilinx.com, lulu@redhat.com,
	hanand@xilinx.com, hch@infradead.org, eperezma@redhat.com,
	jgg@mellanox.com, shahafs@mellanox.com, kevin.tian@intel.com,
	parav@mellanox.com, vmireyno@marvell.com,
	cunming.liang@intel.com, gdawar@xilinx.com, jiri@mellanox.com,
	xiao.w.wang@intel.com, stefanha@redhat.com,
	zhihong.wang@intel.com, aadam@redhat.com, rdunlap@infradead.org,
	maxime.coquelin@redhat.com, lingshan.zhu@intel.com
Subject: [PATCH v3 05/13] vhost: check the existence of vhost_set_iotlb_callback
Date: Wed,  1 Jul 2020 17:24:41 +0800	[thread overview]
Message-ID: <20200701092449.17451-6-lulu@redhat.com> (raw)
In-Reply-To: <20200701092449.17451-1-lulu@redhat.com>

From: Jason Wang <jasowang@redhat.com>

Add the check of vhost_set_iotlb_callback
before calling

Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Cindy Lu <lulu@redhat.com>
---
 hw/virtio/vhost.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index 5fd25fe520..10304b583e 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -1686,8 +1686,9 @@ int vhost_dev_start(struct vhost_dev *hdev, VirtIODevice *vdev)
         }
     }
 
-    if (vhost_dev_has_iommu(hdev)) {
-        hdev->vhost_ops->vhost_set_iotlb_callback(hdev, true);
+    if (vhost_dev_has_iommu(hdev) &&
+        hdev->vhost_ops->vhost_set_iotlb_callback) {
+            hdev->vhost_ops->vhost_set_iotlb_callback(hdev, true);
 
         /* Update used ring information for IOTLB to work correctly,
          * vhost-kernel code requires for this.*/
@@ -1730,7 +1731,9 @@ void vhost_dev_stop(struct vhost_dev *hdev, VirtIODevice *vdev)
     }
 
     if (vhost_dev_has_iommu(hdev)) {
-        hdev->vhost_ops->vhost_set_iotlb_callback(hdev, false);
+        if (hdev->vhost_ops->vhost_set_iotlb_callback) {
+            hdev->vhost_ops->vhost_set_iotlb_callback(hdev, false);
+        }
         memory_listener_unregister(&hdev->iommu_listener);
     }
     vhost_log_put(hdev, true);
-- 
2.21.1



  parent reply	other threads:[~2020-07-01  9:29 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-01  9:24 [PATCH v3 00/13] vDPA support in qemu Cindy Lu
2020-07-01  9:24 ` [PATCH v3 01/13] net: introduce qemu_get_peer Cindy Lu
2020-07-01  9:24 ` [PATCH v3 02/13] vhost_net: use the function qemu_get_peer Cindy Lu
2020-07-01  9:24 ` [PATCH v3 03/13] virtio-bus: introduce queue_enabled method Cindy Lu
2020-07-01  9:24 ` [PATCH v3 04/13] virtio-pci: implement " Cindy Lu
2020-07-01  9:24 ` Cindy Lu [this message]
2020-07-01  9:24 ` [PATCH v3 06/13] vhost: introduce new VhostOps vhost_dev_start Cindy Lu
2020-07-01  9:24 ` [PATCH v3 07/13] vhost: implement vhost_dev_start method Cindy Lu
2020-07-01  9:24 ` [PATCH v3 08/13] vhost: introduce new VhostOps vhost_vq_get_addr Cindy Lu
2020-07-01  9:24 ` [PATCH v3 09/13] vhost: implement vhost_vq_get_addr method Cindy Lu
2020-07-01  9:24 ` [PATCH v3 10/13] vhost: introduce new VhostOps vhost_force_iommu Cindy Lu
2020-07-01  9:24 ` [PATCH v3 11/13] vhost: implement vhost_force_iommu method Cindy Lu
2020-07-01  9:24 ` [PATCH v3 12/13] vhost-vdpa: introduce vhost-vdpa backend Cindy Lu
2020-07-01  9:24 ` [PATCH v3 13/13] vhost-vdpa: introduce vhost-vdpa net client Cindy Lu
2020-07-01 14:28   ` Eric Blake
2020-07-01 15:20     ` Michael S. Tsirkin
2020-07-02  2:39       ` Cindy Lu
2020-07-01  9:53 ` [PATCH v3 00/13] vDPA support in qemu no-reply

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=20200701092449.17451-6-lulu@redhat.com \
    --to=lulu@redhat.com \
    --cc=aadam@redhat.com \
    --cc=armbru@redhat.com \
    --cc=cohuck@redhat.com \
    --cc=cunming.liang@intel.com \
    --cc=eblake@redhat.com \
    --cc=eperezma@redhat.com \
    --cc=gdawar@xilinx.com \
    --cc=hanand@xilinx.com \
    --cc=hch@infradead.org \
    --cc=jasowang@redhat.com \
    --cc=jgg@mellanox.com \
    --cc=jiri@mellanox.com \
    --cc=kevin.tian@intel.com \
    --cc=lingshan.zhu@intel.com \
    --cc=maxime.coquelin@redhat.com \
    --cc=mhabets@solarflare.com \
    --cc=mst@redhat.com \
    --cc=parav@mellanox.com \
    --cc=qemu-devel@nongnu.org \
    --cc=rdunlap@infradead.org \
    --cc=rob.miller@broadcom.com \
    --cc=saugatm@xilinx.com \
    --cc=shahafs@mellanox.com \
    --cc=stefanha@redhat.com \
    --cc=vmireyno@marvell.com \
    --cc=xiao.w.wang@intel.com \
    --cc=zhihong.wang@intel.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.