mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vl: move various initialization routines out of qemu_init

Browse Source 
Some very simple initialization routines can be nested in existing
subsystem-level functions, do that to simplify qemu_init.

Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2020-10-21 05:25:58 -04:00
parent 0546c0609c
commit e0d17dfd22
5 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/core/machine.c
View File

@ -877,6 +877,9 @@ static void machine_initfn(Object *obj)
MachineState *ms = MACHINE(obj);
MachineClass *mc = MACHINE_GET_CLASS(obj);
container_get(obj, "/peripheral");
container_get(obj, "/peripheral-anon");
ms->dump_guest_core = true;
ms->mem_merge = true;
ms->enable_graphics = true;

8
include/hw/qdev-core.h
View File

@ -787,14 +787,6 @@ BusState *sysbus_get_default(void);
char *qdev_get_fw_dev_path(DeviceState *dev);
char *qdev_get_own_fw_dev_path_from_handler(BusState *bus, DeviceState *dev);
/**
* @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);
/**
* device_legacy_reset:
*

4
migration/migration.c
View File

@ -182,6 +182,10 @@ void migration_object_init(void)
error_report_err(err);
exit(1);
}
blk_mig_init();
ram_mig_init();
dirty_bitmap_mig_init();
}
void migration_shutdown(void)

6
softmmu/qdev-monitor.c
View File

@ -928,12 +928,6 @@ BlockBackend *blk_by_qdev_id(const char *id, Error **errp)
return blk;
}
void qdev_machine_init(void)
{
qdev_get_peripheral_anon();
qdev_get_peripheral();
}
QemuOptsList qemu_device_opts = {
.name = "device",
.implied_opt_name = "driver",

5
softmmu/vl.c
View File

@ -4280,10 +4280,6 @@ void qemu_init(int argc, char **argv, char **envp)
exit(1);
}
blk_mig_init();
ram_mig_init();
dirty_bitmap_mig_init();
qemu_opts_foreach(qemu_find_opts("mon"),
mon_init_func, NULL, &error_fatal);
@ -4316,7 +4312,6 @@ void qemu_init(int argc, char **argv, char **envp)
reading from the other reads, because timer polling functions query
clock values from the log. */
replay_checkpoint(CHECKPOINT_INIT);
qdev_machine_init();
current_machine->boot_order = boot_order;