diff options
| author | Markus Armbruster | 2020-06-09 14:23:33 +0200 |
|---|---|---|
| committer | Markus Armbruster | 2020-06-15 21:36:21 +0200 |
| commit | 734a5914333ea81e4809699a8539de63a66f0d4c (patch) | |
| tree | 48080026a863f9258beb7a151d2959a1958436ff /hw/display | |
| parent | pnv/psi: Correct the pnv-psi* devices not to be sysbus devices (diff) | |
| download | qemu-734a5914333ea81e4809699a8539de63a66f0d4c.tar.gz qemu-734a5914333ea81e4809699a8539de63a66f0d4c.tar.xz qemu-734a5914333ea81e4809699a8539de63a66f0d4c.zip | |
display/sm501 display/ati: Fix to realize "i2c-ddc"
sm501_init() and ati_vga_realize() create an "i2c-ddc" device, but
neglect to realize it. Affects machines sam460ex, shix, r2d, and
fulong2e.
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.
This one appears 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 it right away. Visible in "info qom-tree"; here's
the change for sam460ex:
/machine (sam460ex-machine)
[...]
/unattached (container)
[...]
- /device[14] (sii3112)
+ /device[14] (i2c-ddc)
+ /device[15] (sii3112)
[rest of device[*] renumbered...]
Fixes: 4a1f253adb45ac6019971193d5077c4d5d55886a
Fixes: c82c7336de58876862e6b4dccbda29e9240fd388
Cc: BALATON Zoltan <balaton@eik.bme.hu>
Cc: qemu-ppc@nongnu.org
Cc: Magnus Damm <magnus.damm@gmail.com>
Cc: Philippe Mathieu-Daudé <f4bug@amsat.org>
Cc: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Tested-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20200609122339.937862-19-armbru@redhat.com>
Diffstat (limited to 'hw/display')
| -rw-r--r-- | hw/display/ati.c | 2 | ||||
| -rw-r--r-- | hw/display/sm501.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/hw/display/ati.c b/hw/display/ati.c index 67604e68de..1d9df92b96 100644 --- a/hw/display/ati.c +++ b/hw/display/ati.c @@ -935,6 +935,8 @@ static void ati_vga_realize(PCIDevice *dev, Error **errp) bitbang_i2c_init(&s->bbi2c, i2cbus); I2CSlave *i2cddc = I2C_SLAVE(qdev_create(BUS(i2cbus), TYPE_I2CDDC)); i2c_set_slave_address(i2cddc, 0x50); + object_property_set_bool(OBJECT(i2cddc), true, "realized", + &error_abort); /* mmio register space */ memory_region_init_io(&s->mm, OBJECT(s), &ati_mm_ops, s, diff --git a/hw/display/sm501.c b/hw/display/sm501.c index edd8d24a76..fa23a78164 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -1833,6 +1833,8 @@ static void sm501_init(SM501State *s, DeviceState *dev, /* ddc */ I2CDDCState *ddc = I2CDDC(qdev_create(BUS(s->i2c_bus), TYPE_I2CDDC)); i2c_set_slave_address(I2C_SLAVE(ddc), 0x50); + object_property_set_bool(OBJECT(ddc), true, "realized", + &error_abort); /* mmio */ memory_region_init(&s->mmio_region, OBJECT(dev), "sm501.mmio", MMIO_SIZE); |