From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org, Markus Armbruster <armbru@redhat.com>
Cc: "Aurelien Jarno" <aurelien@aurel32.net>,
"Aleksandar Markovic" <amarkovic@wavecomp.com>,
"Aleksandar Rikalo" <arikalo@wavecomp.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [Qemu-devel] [PATCH 3/5] hw/mips/malta: Restrict 'bios_size' variable scope
Date: Tue, 5 Mar 2019 17:28:27 +0100 [thread overview]
Message-ID: <20190305162829.20079-4-philmd@redhat.com> (raw)
In-Reply-To: <20190305162829.20079-1-philmd@redhat.com>
The 'bios_size' variable is only used in the 'if (!kernel_filename &&
!dinfo)' clause. This is the case when we don't provide -pflash command
line option, and also don't provide a -kernel option. In this case we
will check for the -bios option, or use the default BIOS_FILENAME file.
The 'bios' term is valid in this if statement, but is confuse in the
whole mips_malta_init() scope. Restrict his scope.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/mips/mips_malta.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index 00e5aac98b..396645b1a9 100644
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -1196,7 +1196,6 @@ void mips_malta_init(MachineState *machine)
MemoryRegion *ram_low_preio = g_new(MemoryRegion, 1);
MemoryRegion *ram_low_postio;
MemoryRegion *bios, *bios_copy = g_new(MemoryRegion, 1);
- target_long bios_size = FLASH_SIZE;
const size_t smbus_eeprom_size = 8 * 256;
uint8_t *smbus_eeprom_buf = g_malloc0(smbus_eeprom_size);
int64_t kernel_entry, bootloader_run_addr;
@@ -1314,6 +1313,7 @@ void mips_malta_init(MachineState *machine)
bootloader_run_addr, kernel_entry);
}
} else {
+ target_long bios_size = FLASH_SIZE;
/* The flash region isn't executable from a KVM guest */
if (kvm_enabled()) {
error_report("KVM enabled but no -kernel argument was specified. "
--
2.20.1
next prev parent reply other threads:[~2019-03-05 16:29 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-05 16:28 [Qemu-devel] [PATCH 0/5] mips_malta: Clean up definition of flash memory size Philippe Mathieu-Daudé
2019-03-05 16:28 ` [Qemu-devel] [PATCH 1/5] hw/mips/malta: Fix the DEBUG_BOARD_INIT code Philippe Mathieu-Daudé
2019-03-06 13:20 ` Markus Armbruster
2019-03-07 7:06 ` Markus Armbruster
2019-03-07 13:48 ` Aleksandar Markovic
2019-03-07 13:53 ` Aleksandar Markovic
2019-03-05 16:28 ` [Qemu-devel] [PATCH 2/5] hw/mips/malta: Remove fl_sectors variable (used one single time) Philippe Mathieu-Daudé
2019-03-05 16:28 ` Philippe Mathieu-Daudé [this message]
2019-03-05 16:28 ` [Qemu-devel] [PATCH 4/5] hw/mips/malta: Only accept 'monitor' pflash of 4MiB Philippe Mathieu-Daudé
2019-03-05 23:53 ` Richard Henderson
2019-03-06 8:01 ` Philippe Mathieu-Daudé
2019-03-06 13:31 ` Markus Armbruster
2019-03-05 16:28 ` [Qemu-devel] [PATCH 5/5] mips_malta: Clean up definition of flash memory size somewhat Philippe Mathieu-Daudé
2019-03-05 16:34 ` Philippe Mathieu-Daudé
2019-03-05 23:54 ` [Qemu-devel] [PATCH 0/5] mips_malta: Clean up definition of flash memory size Richard Henderson
2019-03-06 6:38 ` Aleksandar Markovic
2019-03-06 9:21 ` Philippe Mathieu-Daudé
2019-03-06 13:33 ` Markus Armbruster
2019-03-06 13:07 ` Markus Armbruster
2019-03-06 13:18 ` Markus Armbruster
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=20190305162829.20079-4-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=amarkovic@wavecomp.com \
--cc=arikalo@wavecomp.com \
--cc=armbru@redhat.com \
--cc=aurelien@aurel32.net \
--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.