qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio

Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20200412' into staging

Fix tcg/mips barrier encoding

# gpg: Signature made Sun 12 Apr 2020 22:08:22 BST
# gpg: using RSA key 7A481E78868B4DB6A85A05C064DF38E8AF7E215F
# gpg: issuer "richard.henderson@linaro.org"
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>" [full]
# Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A 05C0 64DF 38E8 AF7E 215F

* remotes/rth/tags/pull-tcg-20200412:
tcg/mips: mips sync* encode error

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

+5 -5
+5 -5
tcg/mips/tcg-target.inc.c
··· 404 404 405 405 /* MIPS r6 introduced names for weaker variants of SYNC. These are 406 406 backward compatible to previous architecture revisions. */ 407 - OPC_SYNC_WMB = OPC_SYNC | 0x04 << 5, 408 - OPC_SYNC_MB = OPC_SYNC | 0x10 << 5, 409 - OPC_SYNC_ACQUIRE = OPC_SYNC | 0x11 << 5, 410 - OPC_SYNC_RELEASE = OPC_SYNC | 0x12 << 5, 411 - OPC_SYNC_RMB = OPC_SYNC | 0x13 << 5, 407 + OPC_SYNC_WMB = OPC_SYNC | 0x04 << 6, 408 + OPC_SYNC_MB = OPC_SYNC | 0x10 << 6, 409 + OPC_SYNC_ACQUIRE = OPC_SYNC | 0x11 << 6, 410 + OPC_SYNC_RELEASE = OPC_SYNC | 0x12 << 6, 411 + OPC_SYNC_RMB = OPC_SYNC | 0x13 << 6, 412 412 413 413 /* Aliases for convenience. */ 414 414 ALIAS_PADD = sizeof(void *) == 4 ? OPC_ADDU : OPC_DADDU,