[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 05/12] hw/pci-host/q35: Initialize "bypass-iommu" property from b
From: |
Bernhard Beschow |
Subject: |
[PATCH 05/12] hw/pci-host/q35: Initialize "bypass-iommu" property from board code |
Date: |
Tue, 14 Feb 2023 14:14:34 +0100 |
The Q35 PCI host already has a "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>
---
hw/i386/pc_q35.c | 2 ++
hw/pci-host/q35.c | 3 +--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index c2dc87acee..b3c55012d4 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -231,6 +231,8 @@ static void pc_q35_init(MachineState *machine)
x86ms->below_4g_mem_size, NULL);
object_property_set_int(phb, PCI_HOST_ABOVE_4G_MEM_SIZE,
x86ms->above_4g_mem_size, NULL);
+ object_property_set_bool(phb, "bypass-iommu",
+ pcms->default_bus_bypass_iommu, NULL);
sysbus_realize_and_unref(SYS_BUS_DEVICE(phb), &error_fatal);
/* pci */
diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c
index 26e9e28e0e..0e198f97a7 100644
--- a/hw/pci-host/q35.c
+++ b/hw/pci-host/q35.c
@@ -66,8 +66,7 @@ static void q35_host_realize(DeviceState *dev, Error **errp)
s->mch.pci_address_space,
s->mch.address_space_io,
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);
}
--
2.39.1
- [PATCH 00/12] Q35 PCI host fixes and QOM cleanup, Bernhard Beschow, 2023/02/14
- [PATCH 01/12] hw/i386/pc_q35: Resolve redundant q35_host variable, Bernhard Beschow, 2023/02/14
- [PATCH 03/12] hw/pci-host/q35: Use memory_region_set_address() also for tseg_blackhole, Bernhard Beschow, 2023/02/14
- [PATCH 04/12] hw/pci-host/q35: Initialize PCMachineState::bus in board code, Bernhard Beschow, 2023/02/14
- [PATCH 05/12] hw/pci-host/q35: Initialize "bypass-iommu" property from board code,
Bernhard Beschow <=
- [PATCH 06/12] hw/pci-host/q35: Initialize properties just once, Bernhard Beschow, 2023/02/14
- [PATCH 10/12] hw/pci-host/q35: Propagate to errp rather than doing error_fatal, Bernhard Beschow, 2023/02/14
- [PATCH 09/12] hw/pci-host/q35: Rename local variable to more idiomatic "phb", Bernhard Beschow, 2023/02/14
- [PATCH 11/12] hw/pci-host/q35: Merge mch_realize() into q35_host_realize(), Bernhard Beschow, 2023/02/14
- [PATCH 02/12] hw/pci-host/q35: Fix contradicting .endianness assignment, Bernhard Beschow, 2023/02/14
- [PATCH 07/12] hw/pci-host/q35: Initialize PCI hole boundaries just once, Bernhard Beschow, 2023/02/14
- [PATCH 08/12] hw/pci-host/q35: Turn PCI hole properties into class properties, Bernhard Beschow, 2023/02/14
- [PATCH 12/12] hw/pci-host/q35: Move MemoryRegion pointers to host device, Bernhard Beschow, 2023/02/14
- Re: [PATCH 00/12] Q35 PCI host fixes and QOM cleanup, Bernhard Beschow, 2023/02/21