Re: [Qemu-devel] [PATCH 05/11] heathrow: change heathrow_pic_init() to return the heathrow device

[David Gibson]

On Mon, Feb 19, 2018 at 06:19:16PM +0000, Mark Cave-Ayland wrote:
> This enables the device to be made available during the setup of the Old World
> machine. In order to pass back the previous set of IRQs we temporarily 
> introduce
> a new pic_irqs parameter until it can be removed.
> 
> An additional benefit of this change is that it is also possible to remove the
> pic_mem pointer used for macio by accessing the memory region via sysbus.
> 
> Signed-off-by: Mark Cave-Ayland <address@hidden>

Reviewed-by: David Gibson <address@hidden>

> ---
>  hw/intc/heathrow_pic.c | 10 ++++++----
>  hw/ppc/mac.h           |  4 ++--
>  hw/ppc/mac_oldworld.c  |  9 +++++----
>  3 files changed, 13 insertions(+), 10 deletions(-)
> 
> diff --git a/hw/intc/heathrow_pic.c b/hw/intc/heathrow_pic.c
> index afe0b08cbb..1cf4db1e79 100644
> --- a/hw/intc/heathrow_pic.c
> +++ b/hw/intc/heathrow_pic.c
> @@ -173,13 +173,15 @@ static void heathrow_reset(DeviceState *d)
>  static void heathrow_init(Object *obj)
>  {
>      HeathrowState *s = HEATHROW(obj);
> +    SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
>  
>      memory_region_init_io(&s->mem, OBJECT(s), &heathrow_ops, s,
>                            "heathrow-pic", 0x1000);
> +    sysbus_init_mmio(sbd, &s->mem);
>  }
>  
> -qemu_irq *heathrow_pic_init(MemoryRegion **pmem,
> -                            int nb_cpus, qemu_irq **irqs)
> +DeviceState *heathrow_pic_init(int nb_cpus, qemu_irq **irqs,
> +                               qemu_irq **pic_irqs)
>  {
>      DeviceState *d;
>      HeathrowState *s;
> @@ -191,9 +193,9 @@ qemu_irq *heathrow_pic_init(MemoryRegion **pmem,
>      /* only 1 CPU */
>      s->irqs = irqs[0];
>  
> -    *pmem = &s->mem;
> +    *pic_irqs = qemu_allocate_irqs(heathrow_set_irq, s, HEATHROW_NUM_IRQS);
>  
> -    return qemu_allocate_irqs(heathrow_set_irq, s, HEATHROW_NUM_IRQS);
> +    return d;
>  }
>  
>  static void heathrow_class_init(ObjectClass *oc, void *data)
> diff --git a/hw/ppc/mac.h b/hw/ppc/mac.h
> index 261b519aa5..5b5fffdff3 100644
> --- a/hw/ppc/mac.h
> +++ b/hw/ppc/mac.h
> @@ -79,8 +79,8 @@ void macio_init(PCIDevice *dev,
>                  MemoryRegion *pic_mem);
>  
>  /* Heathrow PIC */
> -qemu_irq *heathrow_pic_init(MemoryRegion **pmem,
> -                            int nb_cpus, qemu_irq **irqs);
> +DeviceState *heathrow_pic_init(int nb_cpus, qemu_irq **irqs,
> +                               qemu_irq **pic_irqs);
>  
>  /* Grackle PCI */
>  #define TYPE_GRACKLE_PCI_HOST_BRIDGE "grackle-pcihost"
> diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
> index 4401ce5af2..06a61220cb 100644
> --- a/hw/ppc/mac_oldworld.c
> +++ b/hw/ppc/mac_oldworld.c
> @@ -94,11 +94,11 @@ static void ppc_heathrow_init(MachineState *machine)
>      PCIBus *pci_bus;
>      PCIDevice *macio;
>      MACIOIDEState *macio_ide;
> -    DeviceState *dev;
> +    DeviceState *dev, *pic_dev;
> +    SysBusDevice *sbd;
>      BusState *adb_bus;
>      int bios_size, ndrv_size;
>      uint8_t *ndrv_file;
> -    MemoryRegion *pic_mem;
>      uint16_t ppc_boot_device;
>      DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
>      void *fw_cfg;
> @@ -257,7 +257,7 @@ static void ppc_heathrow_init(MachineState *machine)
>          error_report("Only 6xx bus is supported on heathrow machine");
>          exit(1);
>      }
> -    pic = heathrow_pic_init(&pic_mem, 1, heathrow_irqs);
> +    pic_dev = heathrow_pic_init(1, heathrow_irqs, &pic);
>      pci_bus = pci_grackle_init(0xfec00000, pic,
>                                 get_system_memory(),
>                                 get_system_io());
> @@ -280,7 +280,8 @@ static void ppc_heathrow_init(MachineState *machine)
>      qdev_connect_gpio_out(dev, 5, pic[0x0E]); /* IDE-1 */
>      qdev_connect_gpio_out(dev, 6, pic[0x03]); /* IDE-1 DMA */
>      qdev_prop_set_uint64(dev, "frequency", tbfreq);
> -    macio_init(macio, pic_mem);
> +    sbd = SYS_BUS_DEVICE(pic_dev);
> +    macio_init(macio, sysbus_mmio_get_region(sbd, 0));
>  
>      macio_ide = MACIO_IDE(object_resolve_path_component(OBJECT(macio),
>                                                          "ide[0]"));

-- 
David Gibson                    | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au  | minimalist, thank you.  NOT _the_ _other_
                                | _way_ _around_!
http://www.ozlabs.org/~dgibson

signature.asc
Description: PGP signature