[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] amd_iommu: Return error on machines with no PCI
From: |
Mohammed Gamal |
Subject: |
[Qemu-devel] [PATCH] amd_iommu: Return error on machines with no PCI |
Date: |
Thu, 14 Sep 2017 22:18:31 +0200 |
Starting the following command line causes a segfault
qemu-system-x86_64 -S -machine isapc,accel=kvm -device amd-iommu
This is due to the fact that the machine type 'isapc' doesn't have
a PCI bus, while amd_iommu doesn't check if the machine has PCI support
and subsequently does a null-pointer access. AMD IOMMU shouldn't even work
if the target machine doesn't have PCI.
Add a check for PCI on the given machine type and return an error if PCI
is not supported.
Signed-off-by: Mohammed Gamal <address@hidden>
---
hw/i386/amd_iommu.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c
index 334938a..9a667b7 100644
--- a/hw/i386/amd_iommu.c
+++ b/hw/i386/amd_iommu.c
@@ -1153,6 +1153,13 @@ static void amdvi_realize(DeviceState *dev, Error **err)
}
bus = pcms->bus;
+
+ if (!bus) {
+ error_setg(err, "Machine-type '%s' does not support PCI",
+ mc->name);
+ return;
+ }
+
s->iotlb = g_hash_table_new_full(amdvi_uint64_hash,
amdvi_uint64_equal, g_free, g_free);
--
1.8.3.1
- [Qemu-devel] [PATCH] amd_iommu: Return error on machines with no PCI,
Mohammed Gamal <=