Commit 83d2e94c authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-signed' into staging 



qemu-sparc update

# gpg: Signature made Thu 08 Mar 2018 07:23:01 GMT
# gpg:                using RSA key 5BC2C56FAE0F321F
# gpg: Good signature from "Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>"
# Primary key fingerprint: CC62 1AB9 8E82 200D 915C  C9C4 5BC2 C56F AE0F 321F

* remotes/mcayland/tags/qemu-sparc-signed:
  sparc: fix leon3 casa instruction when MMU is disabled
  hw/sparc/sun4m: Fix implicit creation of "-drive if=scsi" devices

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 0ab4537f 6e10f37c

hw/sparc/sun4m.c

+1 −0
Original line number Diff line number Diff line
@@ -324,6 +324,7 @@ static void *sparc32_dma_init(hwaddr dma_base, 


    esp = ESP_STATE(object_resolve_path_component(OBJECT(espdma), "esp"));

    sysbus_mmio_map(SYS_BUS_DEVICE(esp), 0, esp_base);

    scsi_bus_legacy_handle_cmdline(&esp->esp.bus);



    ledma = SPARC32_LEDMA_DEVICE(object_resolve_path_component(

                                 OBJECT(dma), "ledma"));

target/sparc/translate.c

+5 −0
Original line number Diff line number Diff line
@@ -2093,6 +2093,11 @@ static DisasASI get_asi(DisasContext *dc, int insn, TCGMemOp memop) 
            type = GET_ASI_BFILL;

            break;

        }



        /* MMU_PHYS_IDX is used when the MMU is disabled to passthrough the

         * permissions check in get_physical_address(..).

         */

        mem_idx = (dc->mem_idx == MMU_PHYS_IDX) ? MMU_PHYS_IDX : mem_idx;

    } else {

        gen_exception(dc, TT_PRIV_INSN);

        type = GET_ASI_EXCP;