falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ahci: add ahci_get_num_ports 

Instead of reaching into the PCI state, allow the AHCIDevice to
respond with how many ports it has.

Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20170623220926.11479-2-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
This commit is contained in:
John Snow 2017-07-18 11:47:56 -04:00
parent 368e708b4c
commit bbe3179a13
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/i386/pc_q35.c
View File

@ -242,8 +242,8 @@ static void pc_q35_init(MachineState *machine)
true, "ich9-ahci"); true, "ich9-ahci");
idebus[0] = qdev_get_child_bus(&ahci->qdev, "ide.0"); idebus[0] = qdev_get_child_bus(&ahci->qdev, "ide.0");
idebus[1] = qdev_get_child_bus(&ahci->qdev, "ide.1"); idebus[1] = qdev_get_child_bus(&ahci->qdev, "ide.1");
g_assert(MAX_SATA_PORTS == ICH_AHCI(ahci)->ahci.ports); g_assert(MAX_SATA_PORTS == ahci_get_num_ports(ahci));
ide_drive_get(hd, ICH_AHCI(ahci)->ahci.ports); ide_drive_get(hd, ahci_get_num_ports(ahci));
ahci_ide_create_devs(ahci, hd); ahci_ide_create_devs(ahci, hd);
} else { } else {
idebus[0] = idebus[1] = NULL; idebus[0] = idebus[1] = NULL;

8
hw/ide/ahci.c
View File

@ -1833,6 +1833,14 @@ static void sysbus_ahci_register_types(void)
type_init(sysbus_ahci_register_types) type_init(sysbus_ahci_register_types)
int32_t ahci_get_num_ports(PCIDevice *dev)
{
AHCIPCIState *d = ICH_AHCI(dev);
AHCIState *ahci = &d->ahci;
return ahci->ports;
}
void ahci_ide_create_devs(PCIDevice *dev, DriveInfo **hd) void ahci_ide_create_devs(PCIDevice *dev, DriveInfo **hd)
{ {
AHCIPCIState *d = ICH_AHCI(dev); AHCIPCIState *d = ICH_AHCI(dev);

4
hw/mips/boston.c
View File

@ -538,8 +538,8 @@ static void boston_mach_init(MachineState *machine)
ahci = pci_create_simple_multifunction(&PCI_BRIDGE(&pcie2->root)->sec_bus, ahci = pci_create_simple_multifunction(&PCI_BRIDGE(&pcie2->root)->sec_bus,
PCI_DEVFN(0, 0), PCI_DEVFN(0, 0),
true, TYPE_ICH9_AHCI); true, TYPE_ICH9_AHCI);
g_assert(ARRAY_SIZE(hd) == ICH_AHCI(ahci)->ahci.ports); g_assert(ARRAY_SIZE(hd) == ahci_get_num_ports(ahci));
ide_drive_get(hd, ICH_AHCI(ahci)->ahci.ports); ide_drive_get(hd, ahci_get_num_ports(ahci));
ahci_ide_create_devs(ahci, hd); ahci_ide_create_devs(ahci, hd);
if (machine->firmware) { if (machine->firmware) {

1
include/hw/ide/ahci.h
View File

@ -372,6 +372,7 @@ void ahci_uninit(AHCIState *s);
void ahci_reset(AHCIState *s); void ahci_reset(AHCIState *s);
int32_t ahci_get_num_ports(PCIDevice *dev);
void ahci_ide_create_devs(PCIDevice *dev, DriveInfo **hd); void ahci_ide_create_devs(PCIDevice *dev, DriveInfo **hd);
#define TYPE_SYSBUS_AHCI "sysbus-ahci" #define TYPE_SYSBUS_AHCI "sysbus-ahci"