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

hw/arm/sbsa-ref: Do not open-code ahci_ide_create_devs() 

Use ahci_ide_create_devs() instead of open-coding it.
Not accessing AHCIDevice internals anymore allows to
remove "hw/ide/ahci_internal.h" (which isn't really a
public header).

Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20240226080632.9596-2-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-02-25 18:03:15 +01:00
parent 99e1c1137b
commit 72c9d94541
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/arm/sbsa-ref.c
View File

@ -37,7 +37,6 @@
#include "hw/block/flash.h" #include "hw/block/flash.h"
#include "hw/boards.h" #include "hw/boards.h"
#include "hw/ide/internal.h" #include "hw/ide/internal.h"
#include "hw/ide/ahci_internal.h"
#include "hw/ide/ahci-sysbus.h" #include "hw/ide/ahci-sysbus.h"
#include "hw/intc/arm_gicv3_common.h" #include "hw/intc/arm_gicv3_common.h"
#include "hw/intc/arm_gicv3_its_common.h" #include "hw/intc/arm_gicv3_its_common.h"
@ -571,8 +570,6 @@ static void create_ahci(const SBSAMachineState *sms)
DeviceState *dev; DeviceState *dev;
DriveInfo *hd[NUM_SATA_PORTS]; DriveInfo *hd[NUM_SATA_PORTS];
SysbusAHCIState *sysahci; SysbusAHCIState *sysahci;
AHCIState *ahci;
int i;
dev = qdev_new("sysbus-ahci"); dev = qdev_new("sysbus-ahci");
qdev_prop_set_uint32(dev, "num-ports", NUM_SATA_PORTS); qdev_prop_set_uint32(dev, "num-ports", NUM_SATA_PORTS);
@ -581,14 +578,8 @@ static void create_ahci(const SBSAMachineState *sms)
sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, qdev_get_gpio_in(sms->gic, irq)); sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, qdev_get_gpio_in(sms->gic, irq));
sysahci = SYSBUS_AHCI(dev); sysahci = SYSBUS_AHCI(dev);
ahci = &sysahci->ahci;
ide_drive_get(hd, ARRAY_SIZE(hd)); ide_drive_get(hd, ARRAY_SIZE(hd));
for (i = 0; i < ahci->ports; i++) { ahci_ide_create_devs(&sysahci->ahci, hd);
if (hd[i] == NULL) {
continue;
}
ide_bus_create_drive(&ahci->dev[i].port, 0, hd[i]);
}
} }
static void create_xhci(const SBSAMachineState *sms) static void create_xhci(const SBSAMachineState *sms)