[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/5] vhost: check region type before casting
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 1/5] vhost: check region type before casting |
Date: |
Fri, 3 Aug 2018 12:27:57 +0300 |
From: Tiwei Bie <address@hidden>
Check region type first before casting the memory region
to IOMMUMemoryRegion. Otherwise QEMU will abort with below
error message when casting non-IOMMU memory region:
vhost_iommu_region_add: Object 0x561f28bce4f0 is not an
instance of type qemu:iommu-memory-region
Fixes: cb1efcf462a2 ("iommu: Add IOMMU index argument to notifier APIs")
Cc: Peter Maydell <address@hidden>
Signed-off-by: Tiwei Bie <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/virtio/vhost.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index b129cb9ddd..d4cb5894a8 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -663,12 +663,14 @@ static void vhost_iommu_region_add(MemoryListener
*listener,
struct vhost_iommu *iommu;
Int128 end;
int iommu_idx;
- IOMMUMemoryRegion *iommu_mr = IOMMU_MEMORY_REGION(section->mr);
+ IOMMUMemoryRegion *iommu_mr;
if (!memory_region_is_iommu(section->mr)) {
return;
}
+ iommu_mr = IOMMU_MEMORY_REGION(section->mr);
+
iommu = g_malloc0(sizeof(*iommu));
end = int128_add(int128_make64(section->offset_within_region),
section->size);
--
MST
- [Qemu-devel] [PULL 0/5] pc, virtio: fixes, Michael S. Tsirkin, 2018/08/03
- [Qemu-devel] [PULL 1/5] vhost: check region type before casting,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 2/5] hw/acpi-build: Add a check for memory-less NUMA nodes, Michael S. Tsirkin, 2018/08/03
- [Qemu-devel] [PULL 3/5] tests/acpi-test: update ACPI tables test blobs, Michael S. Tsirkin, 2018/08/03
- [Qemu-devel] [PULL 4/5] pc: acpi: fix memory hotplug regression by reducing stub SRAT entry size, Michael S. Tsirkin, 2018/08/03
- [Qemu-devel] [PULL 5/5] tests/acpi: update tables after memory hotplug changes, Michael S. Tsirkin, 2018/08/03
- Re: [Qemu-devel] [PULL 0/5] pc, virtio: fixes, Peter Maydell, 2018/08/03
- Re: [Qemu-devel] [PULL 0/5] pc, virtio: fixes, Peter Maydell, 2018/08/06