[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 05/13] vhost: check the existence of vhost_set_iotlb_callback
From: |
Cindy Lu |
Subject: |
[PATCH v3 05/13] vhost: check the existence of vhost_set_iotlb_callback |
Date: |
Wed, 1 Jul 2020 17:24:41 +0800 |
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
- [PATCH v3 00/13] vDPA support in qemu, Cindy Lu, 2020/07/01
- [PATCH v3 01/13] net: introduce qemu_get_peer, Cindy Lu, 2020/07/01
- [PATCH v3 02/13] vhost_net: use the function qemu_get_peer, Cindy Lu, 2020/07/01
- [PATCH v3 03/13] virtio-bus: introduce queue_enabled method, Cindy Lu, 2020/07/01
- [PATCH v3 04/13] virtio-pci: implement queue_enabled method, Cindy Lu, 2020/07/01
- [PATCH v3 05/13] vhost: check the existence of vhost_set_iotlb_callback,
Cindy Lu <=
- [PATCH v3 06/13] vhost: introduce new VhostOps vhost_dev_start, Cindy Lu, 2020/07/01
- [PATCH v3 07/13] vhost: implement vhost_dev_start method, Cindy Lu, 2020/07/01
- [PATCH v3 08/13] vhost: introduce new VhostOps vhost_vq_get_addr, Cindy Lu, 2020/07/01
- [PATCH v3 09/13] vhost: implement vhost_vq_get_addr method, Cindy Lu, 2020/07/01
- [PATCH v3 10/13] vhost: introduce new VhostOps vhost_force_iommu, Cindy Lu, 2020/07/01
- [PATCH v3 11/13] vhost: implement vhost_force_iommu method, Cindy Lu, 2020/07/01
- [PATCH v3 12/13] vhost-vdpa: introduce vhost-vdpa backend, Cindy Lu, 2020/07/01
- [PATCH v3 13/13] vhost-vdpa: introduce vhost-vdpa net client, Cindy Lu, 2020/07/01