Merge remote branch 'mst/for_anthony' into staging

1 files changed, 3 insertions, 1 deletions

diff --git a/vl.c b/vl.c
index 78fcef1fee..0292184273 100644
--- a/vl.c
+++ b/vl.c
@@ -3092,7 +3092,9 @@ int main(int argc, char **argv, char **envp)
         exit(1);
     }
 
-    qemu_register_reset((void *)qbus_reset_all, sysbus_get_default());
+    /* TODO: once all bus devices are qdevified, this should be done
+     * when bus is created by qdev.c */
+    qemu_register_reset(qbus_reset_all_fn, sysbus_get_default());
     qemu_run_machine_init_done_notifiers();
 
     qemu_system_reset();