Commit 74c02ebd authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Markus Armbruster
Browse files

hw/mips/malta: Restrict 'bios_size' variable scope 



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: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <20190308094610.21210-13-armbru@redhat.com>
parent 5207c595

hw/mips/mips_malta.c

+1 −1
Original line number Diff line number Diff line
@@ -1193,7 +1193,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;
@@ -1301,6 +1300,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. "