Re: [Qemu-devel] [PATCH 1/3] ahci: add ahci_get_num_ports

[Philippe Mathieu-Daudé]

On Fri, Jun 23, 2017 at 7:09 PM, John Snow <address@hidden> wrote:
> Instead of reaching into the PCI state, allow the AHCIDevice to
> respond with how many ports it has.
>
> Signed-off-by: John Snow <address@hidden>

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>

> ---
>  hw/i386/pc_q35.c      | 4 ++--
>  hw/ide/ahci.c         | 8 ++++++++
>  hw/mips/boston.c      | 4 ++--
>  include/hw/ide/ahci.h | 1 +
>  4 files changed, 13 insertions(+), 4 deletions(-)
>
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index 1523ef3..8715514 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -241,8 +241,8 @@ static void pc_q35_init(MachineState *machine)
>                                                 true, "ich9-ahci");
>          idebus[0] = qdev_get_child_bus(&ahci->qdev, "ide.0");
>          idebus[1] = qdev_get_child_bus(&ahci->qdev, "ide.1");
> -        g_assert(MAX_SATA_PORTS == ICH_AHCI(ahci)->ahci.ports);
> -        ide_drive_get(hd, ICH_AHCI(ahci)->ahci.ports);
> +        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);
>      } else {
>          idebus[0] = idebus[1] = NULL;
> diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
> index f60826d..1ab3245 100644
> --- a/hw/ide/ahci.c
> +++ b/hw/ide/ahci.c
> @@ -1833,6 +1833,14 @@ static void sysbus_ahci_register_types(void)
>
>  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)
>  {
>      AHCIPCIState *d = ICH_AHCI(dev);
> diff --git a/hw/mips/boston.c b/hw/mips/boston.c
> index a4677f7..ad59404 100644
> --- a/hw/mips/boston.c
> +++ b/hw/mips/boston.c
> @@ -538,8 +538,8 @@ static void boston_mach_init(MachineState *machine)
>      ahci = 
> pci_create_simple_multifunction(&PCI_BRIDGE(&pcie2->root)->sec_bus,
>                                             PCI_DEVFN(0, 0),
>                                             true, TYPE_ICH9_AHCI);
> -    g_assert(ARRAY_SIZE(hd) == ICH_AHCI(ahci)->ahci.ports);
> -    ide_drive_get(hd, ICH_AHCI(ahci)->ahci.ports);
> +    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);
>
>      if (machine->firmware) {
> diff --git a/include/hw/ide/ahci.h b/include/hw/ide/ahci.h
> index 0ca7c65..f866bbf 100644
> --- a/include/hw/ide/ahci.h
> +++ b/include/hw/ide/ahci.h
> @@ -372,6 +372,7 @@ void ahci_uninit(AHCIState *s);
>
>  void ahci_reset(AHCIState *s);
>
> +int32_t ahci_get_num_ports(PCIDevice *dev);
>  void ahci_ide_create_devs(PCIDevice *dev, DriveInfo **hd);
>
>  #define TYPE_SYSBUS_AHCI "sysbus-ahci"
> --
> 2.9.4
>