On Mon, Feb 19, 2018 at 06:19:21PM +0000, Mark Cave-Ayland wrote:
> This removes the last of the functionality from macio_init() in preparation
> for its subsequent removal.
>
> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
> ---
> hw/misc/macio/macio.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c
> index e5288f1084..f71ed61819 100644
> --- a/hw/misc/macio/macio.c
> +++ b/hw/misc/macio/macio.c
> @@ -101,6 +101,8 @@ static void macio_common_realize(PCIDevice *d, Error **errp)
> memory_region_add_subregion(&s->bar, 0x08000,
> sysbus_mmio_get_region(sysbus_dev, 0));
>
> + qdev_prop_set_uint64(DEVICE(&s->cuda), "timebase-frequency",
> + s->frequency);
> object_property_set_bool(OBJECT(&s->cuda), true, "realized", &err);
> if (err) {
> error_propagate(errp, err);
> @@ -444,12 +446,7 @@ type_init(macio_register_types)
> void macio_init(PCIDevice *d,
> MemoryRegion *pic_mem)
> {
> - MacIOState *macio_state = MACIO(d);
> -
> /* Note: this code is strongly inspirated from the corresponding code
> in PearPC */
> - qdev_prop_set_uint64(DEVICE(&macio_state->cuda), "timebase-frequency",
> - macio_state->frequency);
> -
> qdev_init_nofail(DEVICE(d));
> }
--
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