From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Subject: [PULL 2/6] vl: convert qemu_machine_creation_done() to Error **
Date: Wed, 20 Mar 2024 11:32:09 +0100 [thread overview]
Message-ID: <20240320103213.1048405-3-pbonzini@redhat.com> (raw)
In-Reply-To: <20240320103213.1048405-1-pbonzini@redhat.com>
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 | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/system/vl.c b/system/vl.c
index 70f4cece7f9..0c970cf0203 100644
--- a/system/vl.c
+++ b/system/vl.c
@@ -2653,7 +2653,7 @@ static void qemu_create_cli_devices(void)
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 @@ static void qemu_machine_creation_done(void)
}
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 @@ static void qemu_machine_creation_done(void)
"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 @@ void qmp_x_exit_preconfig(Error **errp)
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();
--
2.44.0
next prev parent reply other threads:[~2024-03-20 10:33 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-20 10:32 [PULL 0/6] QEMU bug fixes for 20240320 Paolo Bonzini
2024-03-20 10:32 ` [PULL 1/6] target/i386: fix direction of "32-bit MMU" test Paolo Bonzini
2024-03-20 10:32 ` Paolo Bonzini [this message]
2024-03-20 10:32 ` [PULL 3/6] vl: do not assert if sev-guest is used together with TCG Paolo Bonzini
2024-03-20 10:32 ` [PULL 4/6] target/i386: Revert monitor_puts() in do_inject_x86_mce() Paolo Bonzini
2024-03-20 10:32 ` [PULL 5/6] tests/plugins: fix use-after-free bug Paolo Bonzini
2024-03-20 10:32 ` [PULL 6/6] meson: remove dead dictionary access Paolo Bonzini
2024-03-20 16:58 ` [PULL 0/6] QEMU bug fixes for 20240320 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240320103213.1048405-3-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.