Re: [Qemu-ppc] [PATCH 05/12] e500: name openpic and pci host bridge

[David Gibson]

On Sun, Nov 19, 2017 at 09:24:13PM -0600, Michael Davidsaver wrote:
> Signed-off-by: Michael Davidsaver <address@hidden>

Applied to ppc-for-2.12.

> ---
>  hw/ppc/e500.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
> index 057be1751b..6f77844303 100644
> --- a/hw/ppc/e500.c
> +++ b/hw/ppc/e500.c
> @@ -685,6 +685,8 @@ static DeviceState *ppce500_init_mpic_qemu(PPCE500Params 
> *params,
>      int i, j, k;
>  
>      dev = qdev_create(NULL, TYPE_OPENPIC);
> +    object_property_add_child(qdev_get_machine(), "pic", OBJECT(dev),
> +                              &error_fatal);
>      qdev_prop_set_uint32(dev, "model", params->mpic_version);
>      qdev_prop_set_uint32(dev, "nb_cpus", smp_cpus);
>  
> @@ -876,6 +878,8 @@ void ppce500_init(MachineState *machine, PPCE500Params 
> *params)
>  
>      /* PCI */
>      dev = qdev_create(NULL, "e500-pcihost");
> +    object_property_add_child(qdev_get_machine(), "pci-host", OBJECT(dev),
> +                              &error_abort);
>      qdev_prop_set_uint32(dev, "first_slot", params->pci_first_slot);
>      qdev_prop_set_uint32(dev, "first_pin_irq", pci_irq_nrs[0]);
>      qdev_init_nofail(dev);

-- 
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