vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qemu-sparc update 

-----BEGIN PGP SIGNATURE-----
 
 iQFSBAABCAA8FiEEzGIauY6CIA2RXMnEW8LFb64PMh8FAlqg5NUeHG1hcmsuY2F2
 ZS1heWxhbmRAaWxhbmRlLmNvLnVrAAoJEFvCxW+uDzIf6/MH/jOYcwRktRF9ajBI
 WHOaNASmKigwrmyhdqfwUyaJUFvyxDD/biZrC597BG5+sPLj9l9t1fx+2RTSr7VJ
 2HLvPrFIoqlmIrE635O9r/9nJmEf9jQA8B48ndA7B61wbhwuLZ2duNbFxfIlRf8m
 3/FKH82azUqMQv/3XxYC/cATAZ6uV8taCmL9p9TGkMe6Kn9lUIVgj+/wAMOnnFmC
 OSCqUCo0tk88CVDEyNAVn6voj6NvazIBFp1JJAEYTBwhAnVTLAZUtjXFDdXbbIWV
 FBnRZyVgEOdTOd7jIOHw8t+4ZfnVpUimiy8yQedzMqcGdyIsfaD3x3cyCZoAcftM
 tMZZNcA=
 =hOHV
 -----END PGP SIGNATURE-----

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: Peter Maydell <peter.maydell@linaro.org>
master
Peter Maydell 2018-03-08 13:42:26 +00:00
parent 0ab4537f08 6e10f37c86
commit 83d2e94cba
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/sparc/sun4m.c
View File

@ -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"));

5
target/sparc/translate.c
View File

@ -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;