mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/qdev-clock: Avoid calling qdev_connect_clock_in after DeviceRealize

Browse Source 
Clock canonical name is set in device_set_realized (see the block
added to hw/core/qdev.c in commit 0e6934f264).
If we connect a clock after the device is realized, this code is
not executed. This is currently not a problem as this name is only
used for trace events, however this disrupt tracing.

Add a comment to document qdev_connect_clock_in() must be called
before the device is realized, and assert this condition.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-id: 20200803105647.22223-5-f4bug@amsat.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2020-08-28 10:02:46 +01:00 committed by Peter Maydell
parent f129360ca1
commit 739fa32554
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/core/qdev-clock.c
View File

@ -186,5 +186,6 @@ Clock *qdev_alias_clock(DeviceState *dev, const char *name,
void qdev_connect_clock_in(DeviceState *dev, const char *name, Clock *source) void qdev_connect_clock_in(DeviceState *dev, const char *name, Clock *source)
{ {
assert(!dev->realized);
clock_set_source(qdev_get_clock_in(dev, name), source); clock_set_source(qdev_get_clock_in(dev, name), source);
} }

2
include/hw/qdev-clock.h
View File

@ -70,6 +70,8 @@ Clock *qdev_get_clock_out(DeviceState *dev, const char *name);
* *
* Set the source clock of input clock @name of device @dev to @source. * Set the source clock of input clock @name of device @dev to @source.
* @source period update will be propagated to @name clock. * @source period update will be propagated to @name clock.
*
* Must be called before @dev is realized.
*/ */
void qdev_connect_clock_in(DeviceState *dev, const char *name, Clock *source); void qdev_connect_clock_in(DeviceState *dev, const char *name, Clock *source);