ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/ide/ahci: Rename AHCI PCI function as 'pdev' 

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>
This commit is contained in:
Philippe Mathieu-Daudé 2024-02-13 08:30:00 +01:00
parent d407be0877
commit 41c05b41e3
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/i386/pc_q35.c
View File

@ -134,7 +134,6 @@ static void pc_q35_init(MachineState *machine)
GSIState *gsi_state; GSIState *gsi_state;
ISABus *isa_bus; ISABus *isa_bus;
int i; int i;
PCIDevice *ahci;
ram_addr_t lowmem; ram_addr_t lowmem;
DriveInfo *hd[MAX_SATA_PORTS]; DriveInfo *hd[MAX_SATA_PORTS];
MachineClass *mc = MACHINE_GET_CLASS(machine); MachineClass *mc = MACHINE_GET_CLASS(machine);
@ -292,16 +291,18 @@ static void pc_q35_init(MachineState *machine)
0xff0104); 0xff0104);
if (pcms->sata_enabled) { if (pcms->sata_enabled) {
PCIDevice *pdev;
/* ahci and SATA device, for q35 1 ahci controller is built-in */ /* 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, PCI_DEVFN(ICH9_SATA1_DEV,
ICH9_SATA1_FUNC), ICH9_SATA1_FUNC),
"ich9-ahci"); "ich9-ahci");
idebus[0] = qdev_get_child_bus(DEVICE(ahci), "ide.0"); idebus[0] = qdev_get_child_bus(DEVICE(pdev), "ide.0");
idebus[1] = qdev_get_child_bus(DEVICE(ahci), "ide.1"); idebus[1] = qdev_get_child_bus(DEVICE(pdev), "ide.1");
g_assert(MAX_SATA_PORTS == ahci_get_num_ports(ahci)); g_assert(MAX_SATA_PORTS == ahci_get_num_ports(pdev));
ide_drive_get(hd, ahci_get_num_ports(ahci)); ide_drive_get(hd, ahci_get_num_ports(pdev));
ahci_ide_create_devs(ahci, hd); ahci_ide_create_devs(pdev, hd);
} else { } else {
idebus[0] = idebus[1] = NULL; idebus[0] = idebus[1] = NULL;
} }

10
hw/mips/boston.c
View File

@ -677,7 +677,7 @@ static void boston_mach_init(MachineState *machine)
MemoryRegion *flash, *ddr_low_alias, *lcd, *platreg; MemoryRegion *flash, *ddr_low_alias, *lcd, *platreg;
MemoryRegion *sys_mem = get_system_memory(); MemoryRegion *sys_mem = get_system_memory();
XilinxPCIEHost *pcie2; XilinxPCIEHost *pcie2;
PCIDevice *ahci; PCIDevice *pdev;
DriveInfo *hd[6]; DriveInfo *hd[6];
Chardev *chr; Chardev *chr;
int fw_size, fit_err; 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, qemu_chr_fe_set_handlers(&s->lcd_display, NULL, NULL,
boston_lcd_event, NULL, s, NULL, true); 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); PCI_DEVFN(0, 0), TYPE_ICH9_AHCI);
g_assert(ARRAY_SIZE(hd) == ahci_get_num_ports(ahci)); g_assert(ARRAY_SIZE(hd) == ahci_get_num_ports(pdev));
ide_drive_get(hd, ahci_get_num_ports(ahci)); ide_drive_get(hd, ahci_get_num_ports(pdev));
ahci_ide_create_devs(ahci, hd); ahci_ide_create_devs(pdev, hd);
if (machine->firmware) { if (machine->firmware) {
fw_size = load_image_targphys(machine->firmware, fw_size = load_image_targphys(machine->firmware,