[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 03/15] hw/pci-host/q35: Initialize PCMachineState::bus in board c
From: |
Bernhard Beschow |
Subject: |
[PATCH 03/15] hw/pci-host/q35: Initialize PCMachineState::bus in board code |
Date: |
Sun, 11 Jun 2023 12:34:00 +0200 |
The Q35 PCI host currently sets the PC machine's PCI bus attribute
through global state, thereby assuming the machine to be a PC machine.
The Q35 machine code already holds on to Q35's pci bus attribute, so can
easily set its own property while preserving encapsulation.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
hw/i386/pc_q35.c | 4 +++-
hw/pci-host/q35.c | 1 -
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 62c5d652b7..29b46d3e1c 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -230,10 +230,12 @@ 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);
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(phb), &error_fatal);
/* pci */
- sysbus_realize_and_unref(SYS_BUS_DEVICE(phb), &error_fatal);
host_bus = PCI_BUS(qdev_get_child_bus(DEVICE(phb), "pcie.0"));
+ pcms->bus = host_bus;
+
/* create ISA bus */
lpc = pci_new_multifunction(PCI_DEVFN(ICH9_LPC_DEV, ICH9_LPC_FUNC), true,
TYPE_ICH9_LPC_DEVICE);
diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c
index 859c197f25..23b689dba3 100644
--- a/hw/pci-host/q35.c
+++ b/hw/pci-host/q35.c
@@ -66,7 +66,6 @@ static void q35_host_realize(DeviceState *dev, Error **errp)
s->mch.pci_address_space,
s->mch.address_space_io,
0, TYPE_PCIE_BUS);
- PC_MACHINE(qdev_get_machine())->bus = pci->bus;
pci->bypass_iommu =
PC_MACHINE(qdev_get_machine())->default_bus_bypass_iommu;
qdev_realize(DEVICE(&s->mch), BUS(pci->bus), &error_fatal);
--
2.41.0
- [PATCH 01/15] hw/i386/pc_q35: Resolve redundant q35_host variable, (continued)
- [PATCH 01/15] hw/i386/pc_q35: Resolve redundant q35_host variable, Bernhard Beschow, 2023/06/11
- [PATCH 02/15] hw/pci-host/q35: Fix double, contradicting .endianness assignment, Bernhard Beschow, 2023/06/11
- Re: [PATCH 02/15] hw/pci-host/q35: Fix double, contradicting .endianness assignment, Igor Mammedov, 2023/06/12
- Re: [PATCH 02/15] hw/pci-host/q35: Fix double, contradicting .endianness assignment, Bernhard Beschow, 2023/06/13
- Re: [PATCH 02/15] hw/pci-host/q35: Fix double, contradicting .endianness assignment, Michael S. Tsirkin, 2023/06/13
- Re: [PATCH 02/15] hw/pci-host/q35: Fix double, contradicting .endianness assignment, BALATON Zoltan, 2023/06/13
- Re: [PATCH 02/15] hw/pci-host/q35: Fix double, contradicting .endianness assignment, Igor Mammedov, 2023/06/13
- Re: [PATCH 02/15] hw/pci-host/q35: Fix double, contradicting .endianness assignment, Philippe Mathieu-Daudé, 2023/06/13
- Re: [PATCH 02/15] hw/pci-host/q35: Fix double, contradicting .endianness assignment, Michael S. Tsirkin, 2023/06/13
- Re: [PATCH 02/15] hw/pci-host/q35: Fix double, contradicting .endianness assignment, Bernhard Beschow, 2023/06/13
- [PATCH 03/15] hw/pci-host/q35: Initialize PCMachineState::bus in board code,
Bernhard Beschow <=
- [PATCH 04/15] hw/pci/pci_host: Introduce PCI_HOST_BYPASS_IOMMU macro, Bernhard Beschow, 2023/06/11
- [PATCH 06/15] hw/pci-host/q35: Make some property name macros reusable by i440fx, Bernhard Beschow, 2023/06/11
- [PATCH 07/15] hw/pci-host/i440fx: Replace magic values by existing constants, Bernhard Beschow, 2023/06/11
- [PATCH 05/15] hw/pci-host/q35: Initialize PCI_HOST_BYPASS_IOMMU property from board code, Bernhard Beschow, 2023/06/11