diff options
author | Markus Armbruster <armbru@redhat.com> | 2019-03-08 14:14:37 +0100 |
---|---|---|
committer | Markus Armbruster <armbru@redhat.com> | 2019-03-11 22:53:44 +0100 |
commit | e2fb3fbbf9ce6b8eed00b53a91d3a316362f1b0d (patch) | |
tree | 0eb93c0d777667d1b959604a4d3ed3e05e98bfb4 /vl.c | |
parent | fc4a473482d595da08ae20ce239f0b62fa55d0f2 (diff) | |
download | qemu-e2fb3fbbf9ce6b8eed00b53a91d3a316362f1b0d.zip qemu-e2fb3fbbf9ce6b8eed00b53a91d3a316362f1b0d.tar.gz qemu-e2fb3fbbf9ce6b8eed00b53a91d3a316362f1b0d.tar.bz2 |
sysbus: Fix latent bug with onboard devices
The first call of sysbus_get_default() creates the main system bus and
stores it in QOM as "/machine/unattached/sysbus". This must not
happen before main() creates "/machine", or else container_get() would
"helpfully" create it as "container" object, and the real creation of
"/machine" would later abort with "attempt to add duplicate property
'machine' to object (type 'container')". Has been that way ever since
we wired up busses in QOM (commit f968fc6892d, v1.2.0).
I believe the bug is latent. I got it to bite by trying to
qdev_create() a sysbus device from a machine's .instance_init()
method.
The fix is obvious: store the main system bus in QOM right after
creating "/machine".
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20190308131445.17502-5-armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'vl.c')
-rw-r--r-- | vl.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -3989,6 +3989,10 @@ int main(int argc, char **argv, char **envp) } object_property_add_child(object_get_root(), "machine", OBJECT(current_machine), &error_abort); + object_property_add_child(container_get(OBJECT(current_machine), + "/unattached"), + "sysbus", OBJECT(sysbus_get_default()), + NULL); if (machine_class->minimum_page_bits) { if (!set_preferred_target_page_bits(machine_class->minimum_page_bits)) { |