[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 09/24] macio: Fix to realize "mos6522-cuda" and "mos6522-pmu"
From: |
Markus Armbruster |
Subject: |
[PATCH v2 09/24] macio: Fix to realize "mos6522-cuda" and "mos6522-pmu" devices |
Date: |
Thu, 28 May 2020 13:04:29 +0200 |
cuda_init() creates a "mos6522-cuda" device, but it's never realized.
Affects machines mac99 with via=cuda (default) and g3beige.
pmu_init() creates a "mos6522-pmu" device, but it's never realized.
Affects machine mac99 with via=pmu and via=pmu-adb,
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 onetwo 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 in cuda_realize() and pmu_realize(),
respectively.
Fixes: 6dca62a0000f95e0b7020aa00d0ca9b2c421f341
Cc: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
hw/misc/macio/cuda.c | 10 +++++-----
hw/misc/macio/pmu.c | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c
index e0cc0aac5d..763a785f1a 100644
--- a/hw/misc/macio/cuda.c
+++ b/hw/misc/macio/cuda.c
@@ -33,6 +33,7 @@
#include "hw/misc/macio/cuda.h"
#include "qemu/timer.h"
#include "sysemu/runstate.h"
+#include "qapi/error.h"
#include "qemu/cutils.h"
#include "qemu/log.h"
#include "qemu/module.h"
@@ -523,15 +524,14 @@ static void cuda_realize(DeviceState *dev, Error **errp)
{
CUDAState *s = CUDA(dev);
SysBusDevice *sbd;
- MOS6522State *ms;
- DeviceState *d;
struct tm tm;
+ object_property_set_bool(OBJECT(&s->mos6522_cuda), true, "realized",
+ &error_abort);
+
/* Pass IRQ from 6522 */
- d = DEVICE(&s->mos6522_cuda);
- ms = MOS6522(d);
sbd = SYS_BUS_DEVICE(s);
- sysbus_pass_irq(sbd, SYS_BUS_DEVICE(ms));
+ sysbus_pass_irq(sbd, SYS_BUS_DEVICE(&s->mos6522_cuda));
qemu_get_timedate(&tm, 0);
s->tick_offset = (uint32_t)mktimegm(&tm) + RTC_OFFSET;
diff --git a/hw/misc/macio/pmu.c b/hw/misc/macio/pmu.c
index 9a9cd427e1..4264779396 100644
--- a/hw/misc/macio/pmu.c
+++ b/hw/misc/macio/pmu.c
@@ -40,6 +40,7 @@
#include "hw/misc/macio/pmu.h"
#include "qemu/timer.h"
#include "sysemu/runstate.h"
+#include "qapi/error.h"
#include "qemu/cutils.h"
#include "qemu/log.h"
#include "qemu/module.h"
@@ -740,15 +741,14 @@ static void pmu_realize(DeviceState *dev, Error **errp)
{
PMUState *s = VIA_PMU(dev);
SysBusDevice *sbd;
- MOS6522State *ms;
- DeviceState *d;
struct tm tm;
+ object_property_set_bool(OBJECT(&s->mos6522_pmu), true, "realized",
+ &error_abort);
+
/* Pass IRQ from 6522 */
- d = DEVICE(&s->mos6522_pmu);
- ms = MOS6522(d);
sbd = SYS_BUS_DEVICE(s);
- sysbus_pass_irq(sbd, SYS_BUS_DEVICE(ms));
+ sysbus_pass_irq(sbd, SYS_BUS_DEVICE(&s->mos6522_pmu));
qemu_get_timedate(&tm, 0);
s->tick_offset = (uint32_t)mktimegm(&tm) + RTC_OFFSET;
--
2.21.3
- [PATCH v2 13/24] ppc4xx: Drop redundant device realization, (continued)
- [PATCH v2 13/24] ppc4xx: Drop redundant device realization, Markus Armbruster, 2020/05/28
- [PATCH v2 14/24] macio: Put "macio-nvram" device on the macio bus, Markus Armbruster, 2020/05/28
- [PATCH v2 18/24] display/sm501 display/ati: Fix to realize "i2c-ddc", Markus Armbruster, 2020/05/28
- [PATCH v2 11/24] pnv/phb4: Delete unused "pnv-phb4-pec-stack" devices, Markus Armbruster, 2020/05/28
- [PATCH v2 05/24] arm/aspeed: Rework NIC attachment, Markus Armbruster, 2020/05/28
- [PATCH v2 03/24] sd/pxa2xx_mmci: Fix to realize "pxa2xx-mmci" device, Markus Armbruster, 2020/05/28
- [PATCH v2 07/24] auxbus: Fix aux-to-i2c-bridge to be a subtype of aux-slave, Markus Armbruster, 2020/05/28
- [PATCH v2 22/24] qdev: Assert devices are plugged into a bus that can take them, Markus Armbruster, 2020/05/28
- [PATCH v2 17/24] pnv/psi: Correct the pnv-psi* devices not to be sysbus devices, Markus Armbruster, 2020/05/28
- [PATCH v2 09/24] macio: Fix to realize "mos6522-cuda" and "mos6522-pmu" devices,
Markus Armbruster <=
- [PATCH v2 23/24] sd: Hide the qdev-but-not-quite thing created by sd_init(), Markus Armbruster, 2020/05/28
- [PATCH v2 20/24] riscv: Fix type of SiFive[EU]SocState, member parent_obj, Markus Armbruster, 2020/05/28
- [PATCH v2 04/24] arm/aspeed: Compute the number of CPUs from the SoC definition, Markus Armbruster, 2020/05/28
- [PATCH v2 15/24] macio: Fix macio-bus to be a subtype of System bus, Markus Armbruster, 2020/05/28
- [PATCH v2 16/24] ppc/pnv: Put "*-pnv-chip" and "pnv-xive" on the main system bus, Markus Armbruster, 2020/05/28
- [PATCH v2 24/24] qdev: Assert onboard devices all get realized properly, Markus Armbruster, 2020/05/28
- [PATCH v2 10/24] macio: Delete unused "macio-gpio" devices, Markus Armbruster, 2020/05/28
- [PATCH v2 21/24] sparc/leon3: Fix to put grlib,* devices on sysbus, Markus Armbruster, 2020/05/28
- [PATCH v2 19/24] riscv: Fix to put "riscv.hart_array" devices on sysbus, Markus Armbruster, 2020/05/28