From 1de81d2832e210dda43a101e4163a17bc4d9c71d Mon Sep 17 00:00:00 2001 From: Anthony Liguori Date: Mon, 19 Dec 2011 16:37:46 -0600 Subject: [PATCH] qdev: fix hotplug when no -device is specified The peripheral[-anon] containers are initialized lazily but since they sit on sysbus, they can not be created after realize. This was causing an abort() to occur during hotplug if no -device option was used. This was spotted by qemu-test::device-add.sh Signed-off-by: Anthony Liguori --- hw/qdev.c | 6 ++++++ hw/qdev.h | 8 ++++++++ vl.c | 2 ++ 3 files changed, 16 insertions(+) diff --git a/hw/qdev.c b/hw/qdev.c index 0465632dff..d0cf66de56 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -1529,3 +1529,9 @@ void qdev_property_add_str(DeviceState *dev, const char *name, qdev_property_release_str, prop, errp); } + +void qdev_machine_init(void) +{ + qdev_get_peripheral_anon(); + qdev_get_peripheral(); +} diff --git a/hw/qdev.h b/hw/qdev.h index d5896be40e..2abb767389 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -616,4 +616,12 @@ void qdev_property_add_str(DeviceState *dev, const char *name, */ char *qdev_get_type(DeviceState *dev, Error **errp); +/** + * @qdev_machine_init + * + * Initialize platform devices before machine init. This is a hack until full + * support for composition is added. + */ +void qdev_machine_init(void); + #endif diff --git a/vl.c b/vl.c index da69f94dd1..78b790c919 100644 --- a/vl.c +++ b/vl.c @@ -3335,6 +3335,8 @@ int main(int argc, char **argv, char **envp) } qemu_add_globals(); + qdev_machine_init(); + machine->init(ram_size, boot_devices, kernel_filename, kernel_cmdline, initrd_filename, cpu_model);