Commit a0c167a1 authored by Mohammed Gamal's avatar Mohammed Gamal Committed by Michael S. Tsirkin
Browse files

x86_iommu: check if machine has PCI bus 



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: default avatarPeter Xu <peterx@redhat.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarMohammed Gamal <mgamal@redhat.com>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
parent 29396ed9

hw/i386/x86-iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -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;