Le 09/06/2020 à 14:23, Markus Armbruster a écrit :
> mac_via_realize() creates a "mos6522-q800-via1" and a
> "mos6522-q800-via2" device, but neglects to realize them. Affects
> machine q800.
>
> In theory, a device becomes real only on realize. In practice, the
> transition from unreal to real is a fuzzy one. The work to make a
> device real can be spread between realize methods (fine),
> instance_init methods (wrong), and board code wiring up the device
> (fine as long as it effectively happens on realize). Depending on
> what exactly is done where, a device can work even when we neglect
> to realize it.
>
> These two appear to work. Nevertheless, it's a clear misuse of the
> interface. Even when it works today (more or less by chance), it can
> break tomorrow.
>
> Fix by realizing them right away.
>
> Fixes: 6dca62a0000f95e0b7020aa00d0ca9b2c421f341
> Cc: Laurent Vivier <laurent@vivier.eu>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> ---
> hw/misc/mac_via.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/hw/misc/mac_via.c b/hw/misc/mac_via.c
> index e05623d730..82614c155a 100644
> --- a/hw/misc/mac_via.c
> +++ b/hw/misc/mac_via.c
> @@ -890,6 +890,11 @@ static void mac_via_realize(DeviceState *dev, Error **errp)
> object_property_add_alias(OBJECT(dev), "irq[1]", OBJECT(ms),
> SYSBUS_DEVICE_GPIO_IRQ "[0]");
>
> + object_property_set_bool(OBJECT(&m->mos6522_via1), true, "realized",
> + &error_abort);
> + object_property_set_bool(OBJECT(&m->mos6522_via2), true, "realized",
> + &error_abort);
> +
> /* Pass through mos6522 input IRQs */
> qdev_pass_gpios(DEVICE(&m->mos6522_via1), dev, "via1-irq");
> qdev_pass_gpios(DEVICE(&m->mos6522_via2), dev, "via2-irq");
>
Tested-by: Laurent Vivier <laurent@vivier.eu>
Acked-by: Laurent Vivier <laurent@vivier.eu>