[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v4 22/29] x86_iommu: check if machine has PCI bus
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v4 22/29] x86_iommu: check if machine has PCI bus |
Date: |
Thu, 18 Jan 2018 22:46:27 +0200 |
From: Mohammed Gamal <address@hidden>
Starting qemu with
qemu-system-x86_64 -S -M isapc -device {amd|intel}-iommu
leads to a segfault. The code assume PCI bus is present and
tries to access the bus structure without checking.
Since Intel VT-d and AMDVI should only work with PCI, add a
check for PCI bus and return error if not present.
Reviewed-by: Peter Xu <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Signed-off-by: Mohammed Gamal <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
---
hw/i386/x86-iommu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/i386/x86-iommu.c b/hw/i386/x86-iommu.c
index 51de519..8a01a2d 100644
--- a/hw/i386/x86-iommu.c
+++ b/hw/i386/x86-iommu.c
@@ -88,7 +88,7 @@ static void x86_iommu_realize(DeviceState *dev, Error **errp)
PC_MACHINE(object_dynamic_cast(OBJECT(ms), TYPE_PC_MACHINE));
QLIST_INIT(&x86_iommu->iec_notifiers);
- if (!pcms) {
+ if (!pcms || !pcms->bus) {
error_setg(errp, "Machine-type '%s' not supported by IOMMU",
mc->name);
return;
--
MST
- [Qemu-devel] [PULL v4 15/29] hw/acpi-build: Make next_base easy to follow, (continued)
- [Qemu-devel] [PULL v4 15/29] hw/acpi-build: Make next_base easy to follow, Michael S. Tsirkin, 2018/01/18
- [Qemu-devel] [PULL v4 16/29] vhost-user-test: fix features mask, Michael S. Tsirkin, 2018/01/18
- [Qemu-devel] [PULL v4 17/29] vhost-user-test: extract read-guest-mem test from main loop, Michael S. Tsirkin, 2018/01/18
- [Qemu-devel] [PULL v4 18/29] vhost-user-test: setup virtqueues in all tests, Michael S. Tsirkin, 2018/01/18
- [Qemu-devel] [PULL v4 19/29] vhost-user-test: make features mask an init_virtio_dev() argument, Michael S. Tsirkin, 2018/01/18
- [Qemu-devel] [PULL v4 20/29] vhost-user-test: use init_virtio_dev in multiqueue test, Michael S. Tsirkin, 2018/01/18
- [Qemu-devel] [PULL v4 21/29] x86_iommu: Move machine check to x86_iommu_realize(), Michael S. Tsirkin, 2018/01/18
- [Qemu-devel] [PULL v4 24/29] tests: acpi: init table descriptor in test_dst_table(), Michael S. Tsirkin, 2018/01/18
- [Qemu-devel] [PULL v4 25/29] tests: acpi: rename test_acpi_tables()/test_dst_table() to reflect its usage, Michael S. Tsirkin, 2018/01/18
- [Qemu-devel] [PULL v4 26/29] tests: acpi: add comments to fetch_rsdt_referenced_tables/data->tables usage, Michael S. Tsirkin, 2018/01/18
- [Qemu-devel] [PULL v4 22/29] x86_iommu: check if machine has PCI bus,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL v4 23/29] tests: acpi: move tested tables array allocation outside of test_acpi_dsdt_table(), Michael S. Tsirkin, 2018/01/18
- [Qemu-devel] [PULL v4 27/29] vhost-user: factor out msg head and payload, Michael S. Tsirkin, 2018/01/18
- [Qemu-devel] [PULL v4 28/29] vhost-user: fix misaligned access to payload, Michael S. Tsirkin, 2018/01/18
- [Qemu-devel] [PULL v4 29/29] vhost: remove assertion to prevent crash, Michael S. Tsirkin, 2018/01/18
- Re: [Qemu-devel] [PULL v4 00/29] pc, pci, virtio: features, fixes, cleanups, Peter Maydell, 2018/01/19