|
@@ -1430,18 +1430,6 @@ static void virtio_iommu_freeze_granule(Notifier *notifier, void *data)
|
|
VirtIOIOMMU *s = container_of(notifier, VirtIOIOMMU, machine_done);
|
|
VirtIOIOMMU *s = container_of(notifier, VirtIOIOMMU, machine_done);
|
|
int granule;
|
|
int granule;
|
|
|
|
|
|
- if (likely(s->config.bypass)) {
|
|
|
|
- /*
|
|
|
|
- * Transient IOMMU MR enable to collect page_size_mask requirements
|
|
|
|
- * through memory_region_iommu_set_page_size_mask() called by
|
|
|
|
- * VFIO region_add() callback
|
|
|
|
- */
|
|
|
|
- s->config.bypass = false;
|
|
|
|
- virtio_iommu_switch_address_space_all(s);
|
|
|
|
- /* restore default */
|
|
|
|
- s->config.bypass = true;
|
|
|
|
- virtio_iommu_switch_address_space_all(s);
|
|
|
|
- }
|
|
|
|
s->granule_frozen = true;
|
|
s->granule_frozen = true;
|
|
granule = ctz64(s->config.page_size_mask);
|
|
granule = ctz64(s->config.page_size_mask);
|
|
trace_virtio_iommu_freeze_granule(BIT_ULL(granule));
|
|
trace_virtio_iommu_freeze_granule(BIT_ULL(granule));
|