[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 32/41] vhost: check the existence of vhost_set_iotlb_callback
From: |
Michael S. Tsirkin |
Subject: |
[PULL v2 32/41] vhost: check the existence of vhost_set_iotlb_callback |
Date: |
Sat, 4 Jul 2020 14:30:46 -0400 |
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>
Message-Id: <20200701145538.22333-6-lulu@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Jason Wang <jasowang@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);
--
MST
- [PULL v2 25/41] tests/acpi: remove stale allowed tables, (continued)
- [PULL v2 25/41] tests/acpi: remove stale allowed tables, Michael S. Tsirkin, 2020/07/04
- [PULL v2 27/41] MAINTAINERS: add VT-d entry, Michael S. Tsirkin, 2020/07/04
- [PULL v2 26/41] docs: vhost-user: add Virtio status protocol feature, Michael S. Tsirkin, 2020/07/04
- [PULL v2 28/41] net: introduce qemu_get_peer, Michael S. Tsirkin, 2020/07/04
- [PULL v2 29/41] vhost_net: use the function qemu_get_peer, Michael S. Tsirkin, 2020/07/04
- [PULL v2 30/41] virtio-bus: introduce queue_enabled method, Michael S. Tsirkin, 2020/07/04
- [PULL v2 31/41] virtio-pci: implement queue_enabled method, Michael S. Tsirkin, 2020/07/04
- [PULL v2 32/41] vhost: check the existence of vhost_set_iotlb_callback,
Michael S. Tsirkin <=
- [PULL v2 33/41] vhost: introduce new VhostOps vhost_dev_start, Michael S. Tsirkin, 2020/07/04
- [PULL v2 34/41] vhost: implement vhost_dev_start method, Michael S. Tsirkin, 2020/07/04
- [PULL v2 35/41] vhost: introduce new VhostOps vhost_vq_get_addr, Michael S. Tsirkin, 2020/07/04
- [PULL v2 36/41] vhost: implement vhost_vq_get_addr method, Michael S. Tsirkin, 2020/07/04
- [PULL v2 37/41] vhost: introduce new VhostOps vhost_force_iommu, Michael S. Tsirkin, 2020/07/04
- [PULL v2 39/41] vhost_net: introduce set_config & get_config, Michael S. Tsirkin, 2020/07/04
- [PULL v2 38/41] vhost: implement vhost_force_iommu method, Michael S. Tsirkin, 2020/07/04
- [PULL v2 40/41] vhost-vdpa: introduce vhost-vdpa backend, Michael S. Tsirkin, 2020/07/04