aboutsummaryrefslogtreecommitdiffstats
path: root/vl.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2011-12-19 16:37:46 -0600
committerAnthony Liguori <aliguori@us.ibm.com>2011-12-19 16:39:16 -0600
commit1de81d2832e210dda43a101e4163a17bc4d9c71d (patch)
tree04a50235fae13760bc71d652d6fe15d8d6f043f5 /vl.c
parentab0115e10ca2221a7844ac5fd18842976eec3b2b (diff)
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 <aliguori@us.ibm.com>
Diffstat (limited to 'vl.c')
-rw-r--r--vl.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/vl.c b/vl.c
index da69f94dd..78b790c91 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);