From: Bernhard Beschow <shentey@gmail.com>
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Richard Henderson <richard.henderson@linaro.org>,
Eduardo Habkost <eduardo@habkost.net>,
Marcel Apfelbaum <marcel.apfelbaum@gmail.com>,
Bernhard Beschow <shentey@gmail.com>
Subject: [PATCH 3/4] hw/i386/x86: Eliminate two if statements in x86_bios_rom_init()
Date: Mon, 22 Apr 2024 22:06:24 +0200 [thread overview]
Message-ID: <20240422200625.2768-4-shentey@gmail.com> (raw)
In-Reply-To: <20240422200625.2768-1-shentey@gmail.com>
Given that memory_region_set_readonly() is a no-op when the readonlyness is
already as requested it is possible to simplify the pattern
if (condition) {
foo(true);
}
to
foo(condition);
which is shorter and allows to see the invariant of the code more easily.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
hw/i386/x86.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/hw/i386/x86.c b/hw/i386/x86.c
index ffbda48917..32cd22a4a8 100644
--- a/hw/i386/x86.c
+++ b/hw/i386/x86.c
@@ -1171,9 +1171,7 @@ void x86_bios_rom_init(MachineState *ms, const char *default_firmware,
load_image_size(filename, ptr, bios_size);
x86_firmware_configure(ptr, bios_size);
} else {
- if (!isapc_ram_fw) {
- memory_region_set_readonly(bios, true);
- }
+ memory_region_set_readonly(bios, !isapc_ram_fw);
ret = rom_add_file_fixed(bios_name, (uint32_t)(-bios_size), -1);
if (ret != 0) {
goto bios_error;
@@ -1190,9 +1188,7 @@ void x86_bios_rom_init(MachineState *ms, const char *default_firmware,
0x100000 - isa_bios_size,
isa_bios,
1);
- if (!isapc_ram_fw) {
- memory_region_set_readonly(isa_bios, true);
- }
+ memory_region_set_readonly(isa_bios, !isapc_ram_fw);
/* map all the bios at the top of memory */
memory_region_add_subregion(rom_memory,
--
2.44.0
next prev parent reply other threads:[~2024-04-22 20:07 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-22 20:06 [PATCH 0/4] X86: Alias isa-bios area and clean up Bernhard Beschow
2024-04-22 20:06 ` [PATCH 1/4] hw/i386/pc_sysfw: Remove unused parameter from pc_isa_bios_init() Bernhard Beschow
2024-04-25 7:06 ` Philippe Mathieu-Daudé
2024-04-22 20:06 ` [PATCH 2/4] hw/i386/pc_sysfw: Alias rather than copy isa-bios region Bernhard Beschow
2024-04-22 20:06 ` Bernhard Beschow [this message]
2024-04-25 7:07 ` [PATCH 3/4] hw/i386/x86: Eliminate two if statements in x86_bios_rom_init() Philippe Mathieu-Daudé
2024-04-22 20:06 ` [PATCH 4/4] hw/i386: Consolidate isa-bios creation Bernhard Beschow
2024-04-25 7:19 ` Philippe Mathieu-Daudé
2024-04-26 13:08 ` Bernhard Beschow
2024-04-24 20:05 ` [PATCH 0/4] X86: Alias isa-bios area and clean up Bernhard Beschow
2024-04-25 8:07 ` Philippe Mathieu-Daudé
2024-04-26 13:09 ` Bernhard Beschow
2024-04-25 10:16 ` Michael S. Tsirkin
2024-04-26 13:05 ` Bernhard Beschow
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=20240422200625.2768-4-shentey@gmail.com \
--to=shentey@gmail.com \
--cc=eduardo@habkost.net \
--cc=marcel.apfelbaum@gmail.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.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 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).