openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

MIPS patches queue 

- Fix array overrun (Coverity CID 1450831)
 - Deprecate KVM TE (Trap-and-Emul)
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAmBYpHgACgkQ4+MsLN6t
 wN6fKRAAka2tmVbZw+2FD+T1hBGykNp0ZdFRB0g4qh9gns/l7jWs2lv22Ny9koYE
 VuTpHHyMRrSweZeCBaRbX5lcE1gIPAvCmbl/eosVBRsNiqQs5SPAMGlbr6kbAu2Z
 TTMH7mUp9Q6I8lxiACInE+Q3K0gKPtFse/CjQ3oJ2tnUMvjk0GAn//oI4TZHv4jl
 lIvJ+d1Y/pO7KYFH6VHMeoaUhIyaZ+YpmUBF5yRU9iCxGxKdW7xZaYwcTMS2+jah
 g+C/zVXxanrbfiUQZLkDNqPjPOTsXkf55rSdKn8MK1bvP+xwpTm+mtS8OG5jr20G
 BGGKwUJ3WE+BKB3C/NfRnnVlSQnmpBRaMSm1o3PTFUV8Dt0BJ8Qfqaycq8cxHPsG
 2e+H1WrtmoswalSGXS8b5u4WQKTucDNekjPEdBS5PIOPaY1W3/fUFjlVXpZ5kphm
 pnEk9yXAFvA45pyMzf4I4fZqMFQ+GhRUOUwtQ2Zm209Fucnxtn5iIviH4QcJFt5v
 t9B6liQuuZ/cLY0bUSD/LysW0c9gDKyVCim/GISHoyOQkeQaMAht9JS9zOybmLNa
 ooXfN+rpG+5OqtGdzsfkCQ/rk8jL4G1NbizH/jPlcWQqXhSH80fOKtrdEi26dOMb
 mOujcGKc4ZE33BKdFG/wSBucqsv/OZmcUwFxk9FFvszMLdXfOyg=
 =5qRC
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/philmd/tags/mips-fixes-20210322' into staging

MIPS patches queue

- Fix array overrun (Coverity CID 1450831)
- Deprecate KVM TE (Trap-and-Emul)

# gpg: Signature made Mon 22 Mar 2021 14:06:48 GMT
# gpg:                using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE
# gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [full]
# Primary key fingerprint: FAAB E75E 1291 7221 DCFD  6BB2 E3E3 2C2C DEAD C0DE

* remotes/philmd/tags/mips-fixes-20210322:
  target/mips: Deprecate Trap-and-Emul KVM support
  target/mips/mxu_translate.c: Fix array overrun for D16MIN/D16MAX

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2021-03-22 14:26:13 +00:00
parent b184750926 f071dc1f0c
commit c95bd5ff16
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docs/system/deprecated.rst
View File

@ -186,6 +186,15 @@ Use the more generic commands ``block-export-add`` and ``block-export-del``
instead. As part of this deprecation, where ``nbd-server-add`` used a instead. As part of this deprecation, where ``nbd-server-add`` used a
single ``bitmap``, the new ``block-export-add`` uses a list of ``bitmaps``. single ``bitmap``, the new ``block-export-add`` uses a list of ``bitmaps``.
System accelerators
-------------------
MIPS ``Trap-and-Emul`` KVM support (since 6.0)
''''''''''''''''''''''''''''''''''''''''''''''
The MIPS ``Trap-and-Emul`` KVM host and guest support has been removed
from Linux upstream kernel, declare it deprecated.
System emulator CPUS System emulator CPUS
-------------------- --------------------

8
target/mips/mxu_translate.c
View File

@ -1095,12 +1095,12 @@ static void gen_mxu_D16MAX_D16MIN(DisasContext *ctx)
if (unlikely(pad != 0)) { if (unlikely(pad != 0)) {
/* opcode padding incorrect -> do nothing */ /* opcode padding incorrect -> do nothing */
} else if (unlikely(XRc == 0)) { } else if (unlikely(XRa == 0)) {
/* destination is zero register -> do nothing */ /* destination is zero register -> do nothing */
} else if (unlikely((XRb == 0) && (XRa == 0))) { } else if (unlikely((XRb == 0) && (XRc == 0))) {
/* both operands zero registers -> just set destination to zero */ /* both operands zero registers -> just set destination to zero */
tcg_gen_movi_i32(mxu_gpr[XRc - 1], 0); tcg_gen_movi_i32(mxu_gpr[XRa - 1], 0);
} else if (unlikely((XRb == 0) || (XRa == 0))) { } else if (unlikely((XRb == 0) || (XRc == 0))) {
/* exactly one operand is zero register - find which one is not...*/ /* exactly one operand is zero register - find which one is not...*/
uint32_t XRx = XRb ? XRb : XRc; uint32_t XRx = XRb ? XRb : XRc;
/* ...and do half-word-wise max/min with one operand 0 */ /* ...and do half-word-wise max/min with one operand 0 */