Commit fbdb1d95 authored by James Hogan's avatar James Hogan Committed by Paolo Bonzini
Browse files

mips_malta: Remove incorrect KVM T&E references 



Fix the error message and code comments relating to KVM not supporting
booting from the flash mapping when no kernel is provided. The issue is
a general MIPS KVM issue and isn't specific to the Trap & Emulate
version of MIPS KVM.

Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Reported-by: default avatarAndreas Färber <afaerber@suse.de>
Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
Reviewed-by: default avatarAurelien Jarno <aurelien@aurel32.net>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 0e928b12

hw/mips/mips_malta.c

+3 −3
Original line number Diff line number Diff line
@@ -1028,7 +1028,7 @@ void mips_malta_init(MachineState *machine) 
    fl_idx++;

    if (kernel_filename) {

        ram_low_size = MIN(ram_size, 256 << 20);

        /* For KVM T&E we reserve 1MB of RAM for running bootloader */

        /* For KVM we reserve 1MB of RAM for running bootloader */

        if (kvm_enabled()) {

            ram_low_size -= 0x100000;

            bootloader_run_addr = 0x40000000 + ram_low_size;
@@ -1052,10 +1052,10 @@ void mips_malta_init(MachineState *machine) 
                             bootloader_run_addr, kernel_entry);

        }

    } else {

        /* The flash region isn't executable from a KVM T&E guest */

        /* The flash region isn't executable from a KVM guest */

        if (kvm_enabled()) {

            error_report("KVM enabled but no -kernel argument was specified. "

                         "Booting from flash is not supported with KVM T&E.");

                         "Booting from flash is not supported with KVM.");

            exit(1);

        }

        /* Load firmware from flash. */