diff options
author | Jean-Philippe Brucker <jean-philippe@linaro.org> | 2021-10-26 19:20:22 +0100 |
---|---|---|
committer | Michael S. Tsirkin <mst@redhat.com> | 2021-11-01 18:49:10 -0400 |
commit | 1b3bf13890fd849b2628ca8c059f8d63c74b9572 (patch) | |
tree | 192599f84d1245eb500fb3cfa09ee46a27087dc5 /include/hw | |
parent | 867e9c9f4cbc152aee5ed6157257986ecad29096 (diff) | |
download | qemu-1b3bf13890fd849b2628ca8c059f8d63c74b9572.zip qemu-1b3bf13890fd849b2628ca8c059f8d63c74b9572.tar.gz qemu-1b3bf13890fd849b2628ca8c059f8d63c74b9572.tar.bz2 |
hw/i386/pc: Move IOMMU singleton into PCMachineState
We're about to support a third vIOMMU for x86, virtio-iommu which
doesn't inherit X86IOMMUState. Move the IOMMU singleton into
PCMachineState, so it can be shared between all three vIOMMUs.
The x86_iommu_get_default() helper is still needed by KVM and IOAPIC to
fetch the default IRQ-remapping IOMMU. Since virtio-iommu doesn't
support IRQ remapping, this interface doesn't need to change for the
moment. We could later replace X86IOMMUState with an "IRQ remapping
IOMMU" interface if necessary.
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
Message-Id: <20211026182024.2642038-4-jean-philippe@linaro.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'include/hw')
-rw-r--r-- | include/hw/i386/pc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 11426e2..b72e5bf 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -35,6 +35,7 @@ typedef struct PCMachineState { I2CBus *smbus; PFlashCFI01 *flash[2]; ISADevice *pcspk; + DeviceState *iommu; /* Configuration options: */ uint64_t max_ram_below_4g; |