[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/5] hw/mips/malta: Restrict 'bios_size' variable sc
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH 3/5] hw/mips/malta: Restrict 'bios_size' variable scope |
Date: |
Tue, 5 Mar 2019 17:28:27 +0100 |
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é <address@hidden>
---
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
- [Qemu-devel] [PATCH 0/5] mips_malta: Clean up definition of flash memory size, Philippe Mathieu-Daudé, 2019/03/05
- [Qemu-devel] [PATCH 2/5] hw/mips/malta: Remove fl_sectors variable (used one single time), Philippe Mathieu-Daudé, 2019/03/05
- [Qemu-devel] [PATCH 3/5] hw/mips/malta: Restrict 'bios_size' variable scope,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH 4/5] hw/mips/malta: Only accept 'monitor' pflash of 4MiB, Philippe Mathieu-Daudé, 2019/03/05
- [Qemu-devel] [PATCH 5/5] mips_malta: Clean up definition of flash memory size somewhat, Philippe Mathieu-Daudé, 2019/03/05
- Re: [Qemu-devel] [PATCH 0/5] mips_malta: Clean up definition of flash memory size, Richard Henderson, 2019/03/05
- Re: [Qemu-devel] [PATCH 0/5] mips_malta: Clean up definition of flash memory size, Aleksandar Markovic, 2019/03/06