commit 7ea9cfc8ab57b922822433bc034c484689523c91
author Paolo Bonzini <pbonzini@redhat.com> Mon Mar 18 17:20:01 2024 -0400
committer Paolo Bonzini <pbonzini@redhat.com> Mon Mar 18 22:53:23 2024 +0100
tree 878e31ebd1a776efd9ba9b83876f0f73ceddb26a
parent 2cc68629a6fc198f4a972698bdd6477f883aedfb

vl: convert qemu_machine_creation_done() to Error **

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>

system/vl.c

diff --git a/system/vl.c b/system/vl.c
index 70f4cec..0c970cf 100644
--- a/system/vl.c
+++ b/system/vl.c
@@ -2653,7 +2653,7 @@
     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());
 
@@ -2684,7 +2684,8 @@
     }
 
     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 &&
         vga_interface_type != VGA_NONE) {
@@ -2692,6 +2693,7 @@
                     "type does not use that option; "
                     "No VGA device has been created");
     }
+    return true;
 }
 
 void qmp_x_exit_preconfig(Error **errp)
@@ -2703,7 +2705,9 @@
 
     qemu_init_board();
     qemu_create_cli_devices();
-    qemu_machine_creation_done();
+    if (!qemu_machine_creation_done(errp)) {
+        return;
+    }
 
     if (loadvm) {
         RunState state = autostart ? RUN_STATE_RUNNING : runstate_get();