public/qemu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

hw/pci-host/q35: Initialize PCI_HOST_BYPASS_IOMMU property from board code

Browse source 
The Q35 PCI host already has a PCI_HOST_BYPASS_IOMMU property. However, the
host initializes this property itself by accessing global machine state,
thereby assuming it to be a PC machine. Avoid this by having board code
set this property.

Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230630073720.21297-6-shentey@gmail.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Bernhard Beschow 2023-06-30 09:37:08 +02:00 committed by Michael S. Tsirkin
parent 3b20f4ca59
commit e36102cb07
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hw/i386/pc_q35.c
View file

@ -230,6 +230,8 @@ static void pc_q35_init(MachineState *machine)
x86ms->below_4g_mem_size, NULL); x86ms->below_4g_mem_size, NULL);
object_property_set_int(phb, PCI_HOST_ABOVE_4G_MEM_SIZE, object_property_set_int(phb, PCI_HOST_ABOVE_4G_MEM_SIZE,
x86ms->above_4g_mem_size, NULL); x86ms->above_4g_mem_size, NULL);
object_property_set_bool(phb, PCI_HOST_BYPASS_IOMMU,
pcms->default_bus_bypass_iommu, NULL);
sysbus_realize_and_unref(SYS_BUS_DEVICE(phb), &error_fatal); sysbus_realize_and_unref(SYS_BUS_DEVICE(phb), &error_fatal);
/* pci */ /* pci */

3
hw/pci-host/q35.c
View file

@ -66,8 +66,7 @@ static void q35_host_realize(DeviceState *dev, Error **errp)
s->mch.pci_address_space, s->mch.pci_address_space,
s->mch.address_space_io, s->mch.address_space_io,
0, TYPE_PCIE_BUS); 0, TYPE_PCIE_BUS);
pci->bypass_iommu =
PC_MACHINE(qdev_get_machine())->default_bus_bypass_iommu;
qdev_realize(DEVICE(&s->mch), BUS(pci->bus), &error_fatal); qdev_realize(DEVICE(&s->mch), BUS(pci->bus), &error_fatal);
} }