Merge remote branch 'mst/for_anthony' into staging

This commit is contained in:
Anthony Liguori 2011-01-10 10:32:01 -06:00
commit a7bd621d7a
16 changed files with 410 additions and 35 deletions

4
vl.c
View file

@ -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();