| Submitter | Anthony Liguori |
|---|---|
| Date | Dec. 19, 2011, 10:39 p.m. |
| Message ID | <1324334380-25278-1-git-send-email-aliguori@us.ibm.com> |
| Download | mbox | patch |
| Permalink | /patch/132330/ |
| State | New |
| Headers | show |
Comments
device_del is broken for me in master: $ qemu-system-x86_64 -nodefaults -S -m 384 -vnc :0 -monitor stdio -usb QEMU 1.0.50 monitor - type 'help' for more information (qemu) device_add usb-mouse,id=foo (qemu) device_del foo Device 'foo' is in use Same for any hot-pluggable device I tried, with and without -S. git-bisect fingers this patch, which went in as commit 1de81d28.
Patch
diff --git a/hw/qdev.c b/hw/qdev.c index 0465632..d0cf66d 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 d5896be..2abb767 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 da69f94..78b790c 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);
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 <aliguori@us.ibm.com> --- hw/qdev.c | 6 ++++++ hw/qdev.h | 8 ++++++++ vl.c | 2 ++ 3 files changed, 16 insertions(+), 0 deletions(-)