[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 09/12] hw/pci-host/q35: Rename local variable to more idiomatic "
From: |
Bernhard Beschow |
Subject: |
[PATCH 09/12] hw/pci-host/q35: Rename local variable to more idiomatic "phb" |
Date: |
Tue, 14 Feb 2023 14:14:38 +0100 |
Variables of type PCIHostState* are typically named "phb" in QEMU.
Follow this convention here as well for consistency.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
hw/pci-host/q35.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c
index 2fc047a9c6..8f81debfa5 100644
--- a/hw/pci-host/q35.c
+++ b/hw/pci-host/q35.c
@@ -46,21 +46,21 @@
static void q35_host_realize(DeviceState *dev, Error **errp)
{
- PCIHostState *pci = PCI_HOST_BRIDGE(dev);
Q35PCIHost *s = Q35_HOST_DEVICE(dev);
+ PCIHostState *phb = PCI_HOST_BRIDGE(dev);
SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
memory_region_add_subregion(s->mch.address_space_io,
- MCH_HOST_BRIDGE_CONFIG_ADDR, &pci->conf_mem);
+ MCH_HOST_BRIDGE_CONFIG_ADDR, &phb->conf_mem);
sysbus_init_ioports(sbd, MCH_HOST_BRIDGE_CONFIG_ADDR, 4);
memory_region_add_subregion(s->mch.address_space_io,
- MCH_HOST_BRIDGE_CONFIG_DATA, &pci->data_mem);
+ MCH_HOST_BRIDGE_CONFIG_DATA, &phb->data_mem);
sysbus_init_ioports(sbd, MCH_HOST_BRIDGE_CONFIG_DATA, 4);
/* register q35 0xcf8 port as coalesced pio */
- memory_region_set_flush_coalesced(&pci->data_mem);
- memory_region_add_coalescing(&pci->conf_mem, 0, 4);
+ memory_region_set_flush_coalesced(&phb->data_mem);
+ memory_region_add_coalescing(&phb->conf_mem, 0, 4);
/*
* pci hole goes from end-of-low-ram to io-apic.
@@ -69,12 +69,12 @@ static void q35_host_realize(DeviceState *dev, Error **errp)
range_set_bounds(&s->pci_hole, s->mch.below_4g_mem_size,
IO_APIC_DEFAULT_ADDRESS - 1);
- pci->bus = pci_root_bus_new(DEVICE(s), "pcie.0",
+ phb->bus = pci_root_bus_new(DEVICE(s), "pcie.0",
s->mch.pci_address_space,
s->mch.address_space_io,
0, TYPE_PCIE_BUS);
- qdev_realize(DEVICE(&s->mch), BUS(pci->bus), &error_fatal);
+ qdev_realize(DEVICE(&s->mch), BUS(phb->bus), &error_fatal);
}
static const char *q35_host_root_bus_path(PCIHostState *host_bridge,
--
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, 2023/02/14
- [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 <=
- [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