motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-08 18:23:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

vl: convert qemu_machine_creation_done() to Error **

Browse source 
Allow using Error ** to pass an error string up to qmp_x_exit_preconfig()
and possibly main().

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2024-03-18 17:20:01 -04:00
parent 2cc68629a6
commit 7ea9cfc8ab
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
system/vl.c
View file

@ -2653,7 +2653,7 @@ static void qemu_create_cli_devices(void)
rom_reset_order_override(); rom_reset_order_override();
} }
static void qemu_machine_creation_done(void) static bool qemu_machine_creation_done(Error **errp)
{ {
MachineState *machine = MACHINE(qdev_get_machine()); MachineState *machine = MACHINE(qdev_get_machine());
@ -2684,7 +2684,8 @@ static void qemu_machine_creation_done(void)
} }
if (foreach_device_config(DEV_GDB, gdbserver_start) < 0) { if (foreach_device_config(DEV_GDB, gdbserver_start) < 0) {
exit(1); error_setg(errp, "could not start gdbserver");
return false;
} }
if (!vga_interface_created && !default_vga && if (!vga_interface_created && !default_vga &&
vga_interface_type != VGA_NONE) { vga_interface_type != VGA_NONE) {
@ -2692,6 +2693,7 @@ static void qemu_machine_creation_done(void)
"type does not use that option; " "type does not use that option; "
"No VGA device has been created"); "No VGA device has been created");
} }
return true;
} }
void qmp_x_exit_preconfig(Error **errp) void qmp_x_exit_preconfig(Error **errp)
@ -2703,7 +2705,9 @@ void qmp_x_exit_preconfig(Error **errp)
qemu_init_board(); qemu_init_board();
qemu_create_cli_devices(); qemu_create_cli_devices();
qemu_machine_creation_done(); if (!qemu_machine_creation_done(errp)) {
return;
}
if (loadvm) { if (loadvm) {
RunState state = autostart ? RUN_STATE_RUNNING : runstate_get(); RunState state = autostart ? RUN_STATE_RUNNING : runstate_get();