diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-02-22 11:26:17 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-02-22 11:26:17 +0000 |
| commit | 98e139bcec7544e2ee66117bd52bbec048fa7e4e (patch) | |
| tree | 3c75b5d5504992548637c52612f31c97563e8014 /qapi | |
| parent | faf840a359edb53485bc710fbb3adca9498655dd (diff) | |
| parent | fb1b0fcc03b0c15bc3580309738280ad9565b6d9 (diff) | |
| download | qemu-98e139bcec7544e2ee66117bd52bbec048fa7e4e.zip qemu-98e139bcec7544e2ee66117bd52bbec048fa7e4e.tar.gz qemu-98e139bcec7544e2ee66117bd52bbec048fa7e4e.tar.bz2 | |
Merge remote-tracking branch 'remotes/amarkovic/tags/mips-queue-feb-21-2019-v2' into staging
MIPS queue for February 21st, 2019, v2
# gpg: Signature made Thu 21 Feb 2019 18:37:04 GMT
# gpg: using RSA key D4972A8967F75A65
# gpg: Good signature from "Aleksandar Markovic <amarkovic@wavecomp.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8526 FBF1 5DA3 811F 4A01 DD75 D497 2A89 67F7 5A65
* remotes/amarkovic/tags/mips-queue-feb-21-2019-v2:
target/mips: fulong2e: Dynamically generate SPD EEPROM data
target/mips: fulong2e: Fix bios flash size
hw/pci-host/bonito.c: Add PCI mem region mapped at the correct address
target/mips: implement QMP query-cpu-definitions command
tests/tcg: target/mips: Add wrappers for MSA integer compare instructions
tests/tcg: target/mips: Change directory name 'bit-counting' to 'bit-count'
tests/tcg: target/mips: Correct path to headers in some test source files
hw/misc: mips_itu: Fix 32/64 bit issue in a line involving shift operator
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi')
| -rw-r--r-- | qapi/target.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qapi/target.json b/qapi/target.json index da7b4be..1d4d54b 100644 --- a/qapi/target.json +++ b/qapi/target.json @@ -499,7 +499,7 @@ 'static': 'bool', '*unavailable-features': [ 'str' ], 'typename': 'str' }, - 'if': 'defined(TARGET_PPC) || defined(TARGET_ARM) || defined(TARGET_I386) || defined(TARGET_S390X)' } + 'if': 'defined(TARGET_PPC) || defined(TARGET_ARM) || defined(TARGET_I386) || defined(TARGET_S390X) || defined(TARGET_MIPS)' } ## # @query-cpu-definitions: @@ -511,4 +511,4 @@ # Since: 1.2.0 ## { 'command': 'query-cpu-definitions', 'returns': ['CpuDefinitionInfo'], - 'if': 'defined(TARGET_PPC) || defined(TARGET_ARM) || defined(TARGET_I386) || defined(TARGET_S390X)' } + 'if': 'defined(TARGET_PPC) || defined(TARGET_ARM) || defined(TARGET_I386) || defined(TARGET_S390X) || defined(TARGET_MIPS)' } |