[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/84] mac_via: Fix to realize "mos6522-q800-via*" devices
From: |
Markus Armbruster |
Subject: |
[PULL 10/84] mac_via: Fix to realize "mos6522-q800-via*" devices |
Date: |
Mon, 15 Jun 2020 22:38:54 +0200 |
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>
Message-Id: <20200609122339.937862-9-armbru@redhat.com>
Tested-by: Laurent Vivier <laurent@vivier.eu>
Acked-by: Laurent Vivier <laurent@vivier.eu>
---
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");
--
2.26.2
- [PULL 00/84] QOM patches for 2020-06-15, Markus Armbruster, 2020/06/15
- [PULL 02/84] qom: Make "info qom-tree" show children sorted, Markus Armbruster, 2020/06/15
- [PULL 06/84] arm/aspeed: Compute the number of CPUs from the SoC definition, Markus Armbruster, 2020/06/15
- [PULL 04/84] display/xlnx_dp: Fix to realize "i2c-ddc" and "aux-to-i2c-bridge", Markus Armbruster, 2020/06/15
- [PULL 07/84] arm/aspeed: Rework NIC attachment, Markus Armbruster, 2020/06/15
- [PULL 05/84] sd/pxa2xx_mmci: Fix to realize "pxa2xx-mmci" device, Markus Armbruster, 2020/06/15
- [PULL 16/84] macio: Put "macio-nvram" device on the macio bus, Markus Armbruster, 2020/06/15
- [PULL 10/84] mac_via: Fix to realize "mos6522-q800-via*" devices,
Markus Armbruster <=
- [PULL 09/84] auxbus: Fix aux-to-i2c-bridge to be a subtype of aux-slave, Markus Armbruster, 2020/06/15
- [PULL 24/84] qdev: Assert devices are plugged into a bus that can take them, Markus Armbruster, 2020/06/15
- [PULL 22/84] riscv: Fix type of SiFive[EU]SocState, member parent_obj, Markus Armbruster, 2020/06/15
- [PULL 19/84] pnv/psi: Correct the pnv-psi* devices not to be sysbus devices, Markus Armbruster, 2020/06/15
- [PULL 27/84] qdev: Rename qbus_realize() to qbus_init(), Markus Armbruster, 2020/06/15
- [PULL 11/84] macio: Fix to realize "mos6522-cuda" and "mos6522-pmu" devices, Markus Armbruster, 2020/06/15
- [PULL 15/84] ppc4xx: Drop redundant device realization, Markus Armbruster, 2020/06/15
- [PULL 14/84] MAINTAINERS: Make section PowerNV cover pci-host/pnv* as well, Markus Armbruster, 2020/06/15
- [PULL 17/84] macio: Fix macio-bus to be a subtype of System bus, Markus Armbruster, 2020/06/15
- [PULL 31/84] qdev: Put qdev_new() to use with Coccinelle, Markus Armbruster, 2020/06/15