Commit 33208432 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

macio: Delete unused "macio-gpio" devices 



These devices go with the "via-pmu" device, which is controlled by
property "has-pmu".  macio_newworld_init() creates it unconditionally,
because the property has not been set then.  macio_newworld_realize()
realizes it only when the property is true.  Works, although it can
leave an unrealized device hanging around in the QOM composition tree.
Affects machine mac99 with via=cuda (default).

Delete the unused device by making macio_newworld_realize() unparent
it.  Visible in "info qom-tree":

     /machine (mac99-machine)
       [...]
       /unattached (container)
         /device[9] (macio-newworld)
           [...]
           /escc-legacy-port[8] (qemu:memory-region)
           /escc-legacy-port[9] (qemu:memory-region)
           /escc-legacy[0] (qemu:memory-region)
    -      /gpio (macio-gpio)
    -        /gpio[0] (qemu:memory-region)
           /ide[0] (macio-ide)
             /ide.0 (IDE)
             /pmac-ide[0] (qemu:memory-region)

Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Cc: David Gibson <david@gibson.dropbear.id.au>
Cc: qemu-ppc@nongnu.org
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-Id: <20200609122339.937862-11-armbru@redhat.com>
parent 3d81f594

hw/misc/macio/macio.c

+2 −0
Original line number Diff line number Diff line
@@ -368,6 +368,8 @@ static void macio_newworld_realize(PCIDevice *d, Error **errp) 
        memory_region_add_subregion(&s->bar, 0x16000,

                                    sysbus_mmio_get_region(sysbus_dev, 0));

    } else {

        object_unparent(OBJECT(&ns->gpio));



        /* CUDA */

        object_initialize_child(OBJECT(s), "cuda", &s->cuda, sizeof(s->cuda),

                                TYPE_CUDA, &error_abort, NULL);