Commit 289494da authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20150401' into staging 



target-arm:
 * Fix broken migration on AArch64 KVM
 * Fix minor memory leaks in virt, vexpress, highbank
 * Honour requested filename when loading highbank rom image

# gpg: Signature made Wed Apr  1 18:06:09 2015 BST using RSA key ID 14360CDE
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"

* remotes/pmaydell/tags/pull-target-arm-20150401:
  target-arm: kvm64 fix save/restore of SPSR regs
  target-arm: kvm64 sync FP register state
  hw/intc: arm_gic_kvm.c restore config first
  target-arm: kvm: save/restore mp state
  target-arm: Store SPSR_EL1 state in banked_spsr[1] (SPSR_svc)
  hw/arm/virt: Fix memory leak reported by Coverity
  hw/arm/vexpress: Fix memory leak reported by Coverity
  hw/arm/highbank: Fix resource leak and wrong image loading

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents fde069f7 25b9fb10

hw/arm/highbank.c

+1 −2
Original line number Diff line number Diff line
@@ -278,8 +278,7 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id) 
    if (bios_name != NULL) {

        sysboot_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);

        if (sysboot_filename != NULL) {

            uint32_t filesize = get_image_size(sysboot_filename);

            if (load_image_targphys("sysram.bin", 0xfff88000, filesize) < 0) {

            if (load_image_targphys(sysboot_filename, 0xfff88000, 0x8000) < 0) {

                hw_error("Unable to load %s\n", bios_name);

            }

            g_free(sysboot_filename);

hw/arm/vexpress.c

+9 −2
Original line number Diff line number Diff line
@@ -563,6 +563,7 @@ static void vexpress_common_init(MachineState *machine) 
     */

    if (bios_name) {

        char *fn;

        int image_size;



        if (drive_get(IF_PFLASH, 0, 0)) {

            error_report("The contents of the first flash device may be "
@@ -571,8 +572,14 @@ static void vexpress_common_init(MachineState *machine) 
            exit(1);

        }

        fn = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);

        if (!fn || load_image_targphys(fn, map[VE_NORFLASH0],

                                       VEXPRESS_FLASH_SIZE) < 0) {

        if (!fn) {

            error_report("Could not find ROM image '%s'", bios_name);

            exit(1);

        }

        image_size = load_image_targphys(fn, map[VE_NORFLASH0],

                                         VEXPRESS_FLASH_SIZE);

        g_free(fn);

        if (image_size < 0) {

            error_report("Could not load ROM image '%s'", bios_name);

            exit(1);

        }

hw/arm/virt.c

+8 −1
Original line number Diff line number Diff line
@@ -553,6 +553,7 @@ static void create_flash(const VirtBoardInfo *vbi) 


    if (bios_name) {

        char *fn;

        int image_size;



        if (drive_get(IF_PFLASH, 0, 0)) {

            error_report("The contents of the first flash device may be "
@@ -561,7 +562,13 @@ static void create_flash(const VirtBoardInfo *vbi) 
            exit(1);

        }

        fn = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);

        if (!fn || load_image_targphys(fn, flashbase, flashsize) < 0) {

        if (!fn) {

            error_report("Could not find ROM image '%s'", bios_name);

            exit(1);

        }

        image_size = load_image_targphys(fn, flashbase, flashsize);

        g_free(fn);

        if (image_size < 0) {

            error_report("Could not load ROM image '%s'", bios_name);

            exit(1);

        }

hw/intc/arm_gic_kvm.c

+5 −2
Original line number Diff line number Diff line
@@ -370,6 +370,11 @@ static void kvm_arm_gic_put(GICState *s) 
     * the appropriate CPU interfaces in the kernel) */

    kvm_dist_put(s, 0x800, 8, s->num_irq, translate_targets);



    /* irq_state[n].trigger -> GICD_ICFGRn

     * (restore configuration registers before pending IRQs so we treat

     * level/edge correctly) */

    kvm_dist_put(s, 0xc00, 2, s->num_irq, translate_trigger);



    /* irq_state[n].pending + irq_state[n].level -> GICD_ISPENDRn */

    kvm_dist_put(s, 0x280, 1, s->num_irq, translate_clear);

    kvm_dist_put(s, 0x200, 1, s->num_irq, translate_pending);
@@ -378,8 +383,6 @@ static void kvm_arm_gic_put(GICState *s) 
    kvm_dist_put(s, 0x380, 1, s->num_irq, translate_clear);

    kvm_dist_put(s, 0x300, 1, s->num_irq, translate_active);



    /* irq_state[n].trigger -> GICD_ICFRn */

    kvm_dist_put(s, 0xc00, 2, s->num_irq, translate_trigger);



    /* s->priorityX[irq] -> ICD_IPRIORITYRn */

    kvm_dist_put(s, 0x400, 8, s->num_irq, translate_priority);

target-arm/helper-a64.c

+1 −1
Original line number Diff line number Diff line
@@ -523,7 +523,7 @@ void aarch64_cpu_do_interrupt(CPUState *cs) 
        aarch64_save_sp(env, arm_current_el(env));

        env->elr_el[new_el] = env->pc;

    } else {

        env->banked_spsr[0] = cpsr_read(env);

        env->banked_spsr[aarch64_banked_spsr_index(new_el)] = cpsr_read(env);

        if (!env->thumb) {

            env->cp15.esr_el[new_el] |= 1 << 25;

        }