]> git.ipfire.org Git - thirdparty/qemu.git/commit
hw/i386/pc: Move IOMMU singleton into PCMachineState
authorJean-Philippe Brucker <jean-philippe@linaro.org>
Tue, 26 Oct 2021 18:20:22 +0000 (19:20 +0100)
committerMichael S. Tsirkin <mst@redhat.com>
Mon, 1 Nov 2021 22:49:10 +0000 (18:49 -0400)
commit1b3bf13890fd849b2628ca8c059f8d63c74b9572
tree192599f84d1245eb500fb3cfa09ee46a27087dc5
parent867e9c9f4cbc152aee5ed6157257986ecad29096
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>
hw/i386/pc.c
hw/i386/x86-iommu.c
include/hw/i386/pc.h