From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Eduardo Habkost <eduardo@habkost.net>,
"Michael S. Tsirkin" <mst@redhat.com>,
Xiaoyao Li <xiaoyao.li@intel.com>,
Richard Henderson <richard.henderson@linaro.org>,
Gerd Hoffmann <kraxel@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>
Subject: [PATCH 1/3] i386: move bios load error message
Date: Thu, 31 Mar 2022 10:35:47 +0200 [thread overview]
Message-ID: <20220331083549.749566-2-kraxel@redhat.com> (raw)
In-Reply-To: <20220331083549.749566-1-kraxel@redhat.com>
Switch to usual goto-end-of-function error handling style.
No functional change.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Tested-by: Xiaoyao Li <xiaoyao.li@intel.com>
---
hw/i386/x86.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/hw/i386/x86.c b/hw/i386/x86.c
index 4cf107baea34..b2e801a8720e 100644
--- a/hw/i386/x86.c
+++ b/hw/i386/x86.c
@@ -1121,9 +1121,7 @@ void x86_bios_rom_init(MachineState *ms, const char *default_firmware,
}
ret = rom_add_file_fixed(bios_name, (uint32_t)(-bios_size), -1);
if (ret != 0) {
- bios_error:
- fprintf(stderr, "qemu: could not load PC BIOS '%s'\n", bios_name);
- exit(1);
+ goto bios_error;
}
g_free(filename);
@@ -1144,6 +1142,11 @@ void x86_bios_rom_init(MachineState *ms, const char *default_firmware,
memory_region_add_subregion(rom_memory,
(uint32_t)(-bios_size),
bios);
+ return;
+
+bios_error:
+ fprintf(stderr, "qemu: could not load PC BIOS '%s'\n", bios_name);
+ exit(1);
}
bool x86_machine_is_smm_enabled(const X86MachineState *x86ms)
--
2.35.1
next prev parent reply other threads:[~2022-03-31 8:43 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-31 8:35 [PATCH 0/3] i386: firmware parsing and sev setup for -bios loaded firmware Gerd Hoffmann
2022-03-31 8:35 ` Gerd Hoffmann [this message]
2022-03-31 13:02 ` [PATCH 1/3] i386: move bios load error message Daniel P. Berrangé
2022-03-31 20:45 ` Philippe Mathieu-Daudé
2022-03-31 8:35 ` [PATCH 2/3] i386: factor out x86_firmware_configure() Gerd Hoffmann
2022-03-31 13:07 ` Daniel P. Berrangé
2022-03-31 13:27 ` Gerd Hoffmann
2022-03-31 13:33 ` Daniel P. Berrangé
2022-03-31 21:11 ` Philippe Mathieu-Daudé
2022-04-01 5:08 ` Gerd Hoffmann
2022-04-01 5:28 ` Xiaoyao Li
2022-04-01 10:36 ` Philippe Mathieu-Daudé
2022-04-01 15:25 ` Xiaoyao Li
2022-03-31 8:35 ` [PATCH 3/3] i386: firmware parsing and sev setup for -bios loaded firmware Gerd Hoffmann
2022-03-31 13:10 ` Daniel P. Berrangé
2022-03-31 13:44 ` Gerd Hoffmann
2022-03-31 20:47 ` Philippe Mathieu-Daudé
2022-03-31 20:24 ` [PATCH 0/3] " Michael S. Tsirkin
2022-04-25 13:56 ` Gerd Hoffmann
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=20220331083549.749566-2-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=eduardo@habkost.net \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=xiaoyao.li@intel.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).