[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 49/56] hw/ide/ahci: Rename AHCI PCI function as 'pdev'
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 49/56] hw/ide/ahci: Rename AHCI PCI function as 'pdev' |
Date: |
Thu, 15 Feb 2024 18:57:43 +0100 |
We want to access AHCIPCIState::ahci field. In order to keep
the code simple (avoiding &ahci->ahci), rename the current
'ahci' variable as 'pdev'
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20240213081201.78951-4-philmd@linaro.org>
---
hw/i386/pc_q35.c | 15 ++++++++-------
hw/mips/boston.c | 10 +++++-----
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 76b3b6032b..a89f900c4c 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -134,7 +134,6 @@ static void pc_q35_init(MachineState *machine)
GSIState *gsi_state;
ISABus *isa_bus;
int i;
- PCIDevice *ahci;
ram_addr_t lowmem;
DriveInfo *hd[MAX_SATA_PORTS];
MachineClass *mc = MACHINE_GET_CLASS(machine);
@@ -292,16 +291,18 @@ static void pc_q35_init(MachineState *machine)
0xff0104);
if (pcms->sata_enabled) {
+ PCIDevice *pdev;
+
/* ahci and SATA device, for q35 1 ahci controller is built-in */
- ahci = pci_create_simple_multifunction(host_bus,
+ pdev = pci_create_simple_multifunction(host_bus,
PCI_DEVFN(ICH9_SATA1_DEV,
ICH9_SATA1_FUNC),
"ich9-ahci");
- idebus[0] = qdev_get_child_bus(DEVICE(ahci), "ide.0");
- idebus[1] = qdev_get_child_bus(DEVICE(ahci), "ide.1");
- g_assert(MAX_SATA_PORTS == ahci_get_num_ports(ahci));
- ide_drive_get(hd, ahci_get_num_ports(ahci));
- ahci_ide_create_devs(ahci, hd);
+ idebus[0] = qdev_get_child_bus(DEVICE(pdev), "ide.0");
+ idebus[1] = qdev_get_child_bus(DEVICE(pdev), "ide.1");
+ g_assert(MAX_SATA_PORTS == ahci_get_num_ports(pdev));
+ ide_drive_get(hd, ahci_get_num_ports(pdev));
+ ahci_ide_create_devs(pdev, hd);
} else {
idebus[0] = idebus[1] = NULL;
}
diff --git a/hw/mips/boston.c b/hw/mips/boston.c
index cbcefdd693..0ec0b98066 100644
--- a/hw/mips/boston.c
+++ b/hw/mips/boston.c
@@ -677,7 +677,7 @@ static void boston_mach_init(MachineState *machine)
MemoryRegion *flash, *ddr_low_alias, *lcd, *platreg;
MemoryRegion *sys_mem = get_system_memory();
XilinxPCIEHost *pcie2;
- PCIDevice *ahci;
+ PCIDevice *pdev;
DriveInfo *hd[6];
Chardev *chr;
int fw_size, fit_err;
@@ -769,11 +769,11 @@ static void boston_mach_init(MachineState *machine)
qemu_chr_fe_set_handlers(&s->lcd_display, NULL, NULL,
boston_lcd_event, NULL, s, NULL, true);
- ahci = pci_create_simple_multifunction(&PCI_BRIDGE(&pcie2->root)->sec_bus,
+ pdev = pci_create_simple_multifunction(&PCI_BRIDGE(&pcie2->root)->sec_bus,
PCI_DEVFN(0, 0), TYPE_ICH9_AHCI);
- g_assert(ARRAY_SIZE(hd) == ahci_get_num_ports(ahci));
- ide_drive_get(hd, ahci_get_num_ports(ahci));
- ahci_ide_create_devs(ahci, hd);
+ g_assert(ARRAY_SIZE(hd) == ahci_get_num_ports(pdev));
+ ide_drive_get(hd, ahci_get_num_ports(pdev));
+ ahci_ide_create_devs(pdev, hd);
if (machine->firmware) {
fw_size = load_image_targphys(machine->firmware,
--
2.41.0
- [PULL 38/56] hw/sparc/leon3: remove SP initialization, (continued)
- [PULL 38/56] hw/sparc/leon3: remove SP initialization, Philippe Mathieu-Daudé, 2024/02/15
- [PULL 40/56] hw/sparc/leon3: check cpu_id in the tiny bootloader, Philippe Mathieu-Daudé, 2024/02/15
- [PULL 41/56] hw/sparc/leon3: Pass DeviceState opaque argument to leon3_set_pil_in(), Philippe Mathieu-Daudé, 2024/02/15
- [PULL 39/56] hw/sparc/leon3: implement multiprocessor, Philippe Mathieu-Daudé, 2024/02/15
- [PULL 42/56] hw/sparc/leon3: Pass DeviceState opaque argument to leon3_start_cpu(), Philippe Mathieu-Daudé, 2024/02/15
- [PULL 43/56] hw/sparc/leon3: Initialize GPIO before realizing CPU devices, Philippe Mathieu-Daudé, 2024/02/15
- [PULL 45/56] MAINTAINERS: Add myself as reviewer for TCG Plugins, Philippe Mathieu-Daudé, 2024/02/15
- [PULL 44/56] MAINTAINERS: replace Fabien by myself as Leon3 maintainer, Philippe Mathieu-Daudé, 2024/02/15
- [PULL 47/56] hw/i386/q35: Use DEVICE() cast macro with PCIDevice object, Philippe Mathieu-Daudé, 2024/02/15
- [PULL 48/56] hw/ide/ahci: Expose AHCIPCIState structure, Philippe Mathieu-Daudé, 2024/02/15
- [PULL 49/56] hw/ide/ahci: Rename AHCI PCI function as 'pdev',
Philippe Mathieu-Daudé <=
- [PULL 50/56] hw/ide/ahci: Inline ahci_get_num_ports(), Philippe Mathieu-Daudé, 2024/02/15
- [PULL 46/56] hw/i386/q35: Simplify pc_q35_init() since PCI is always enabled, Philippe Mathieu-Daudé, 2024/02/15
- [PULL 52/56] hw/ide/ahci: Convert AHCIState::ports to unsigned, Philippe Mathieu-Daudé, 2024/02/15
- [PULL 51/56] hw/ide/ahci: Pass AHCI context to ahci_ide_create_devs(), Philippe Mathieu-Daudé, 2024/02/15
- [PULL 53/56] hw/ide/ahci: Do not pass 'ports' argument to ahci_realize(), Philippe Mathieu-Daudé, 2024/02/15
- [PULL 54/56] hw/ide/ahci: Remove SysbusAHCIState::num_ports field, Philippe Mathieu-Daudé, 2024/02/15
- [PULL 56/56] hw/ide/ich9: Use AHCIPCIState typedef, Philippe Mathieu-Daudé, 2024/02/15
- [PULL 55/56] hw/ide/ahci: Move SysBus definitions to 'ahci-sysbus.h', Philippe Mathieu-Daudé, 2024/02/15
- Re: [PULL 00/56] Misc HW patches for 2024-02-15, Peter Maydell, 2024/02/16