diff options
| author | Mohammed Gamal <mgamal@redhat.com> | 2017-11-29 13:33:12 +0100 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2018-01-18 21:52:38 +0200 |
| commit | 29396ed9acfaee9936377ddece4b05452b417861 (patch) | |
| tree | 2440cf7b4dac258fe3d9bb3636dc5bdfe4ae265c /hw/i386/x86-iommu.c | |
| parent | 459f5d29d27c26df194ccc0db7902d1e6fafd0c8 (diff) | |
| download | qemu-29396ed9acfaee9936377ddece4b05452b417861.zip qemu-29396ed9acfaee9936377ddece4b05452b417861.tar.gz qemu-29396ed9acfaee9936377ddece4b05452b417861.tar.bz2 | |
x86_iommu: Move machine check to x86_iommu_realize()
Instead of having the same error checks in vtd_realize()
and amdvi_realize(), move that over to the generic
x86_iommu_realize().
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Mohammed Gamal <mgamal@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'hw/i386/x86-iommu.c')
| -rw-r--r-- | hw/i386/x86-iommu.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/hw/i386/x86-iommu.c b/hw/i386/x86-iommu.c index 293caf8..51de519 100644 --- a/hw/i386/x86-iommu.c +++ b/hw/i386/x86-iommu.c @@ -21,6 +21,8 @@ #include "hw/sysbus.h" #include "hw/boards.h" #include "hw/i386/x86-iommu.h" +#include "hw/i386/pc.h" +#include "qapi/error.h" #include "qemu/error-report.h" #include "trace.h" @@ -80,7 +82,18 @@ static void x86_iommu_realize(DeviceState *dev, Error **errp) { X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(dev); X86IOMMUClass *x86_class = X86_IOMMU_GET_CLASS(dev); + MachineState *ms = MACHINE(qdev_get_machine()); + MachineClass *mc = MACHINE_GET_CLASS(ms); + PCMachineState *pcms = + PC_MACHINE(object_dynamic_cast(OBJECT(ms), TYPE_PC_MACHINE)); QLIST_INIT(&x86_iommu->iec_notifiers); + + if (!pcms) { + error_setg(errp, "Machine-type '%s' not supported by IOMMU", + mc->name); + return; + } + if (x86_class->realize) { x86_class->realize(dev, errp); } |