diff options
| author | Richard Henderson | 2021-10-29 22:54:19 +0200 |
|---|---|---|
| committer | Richard Henderson | 2021-10-29 22:54:19 +0200 |
| commit | a856cce31b48ef1b04ea80893458766ec16e7194 (patch) | |
| tree | faca6de4f849a21ea54e4288d61bde07b7c055cf | |
| parent | Merge remote-tracking branch 'remotes/alistair23/tags/pull-riscv-to-apply-202... (diff) | |
| parent | target/i386: Remove core-capability in Snowridge CPU model (diff) | |
| download | qemu-a856cce31b48ef1b04ea80893458766ec16e7194.tar.gz qemu-a856cce31b48ef1b04ea80893458766ec16e7194.tar.xz qemu-a856cce31b48ef1b04ea80893458766ec16e7194.zip | |
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-next-pull-request' into staging
x86 queue, 2021-10-29
Bug fixes:
* Remove core-capability in Snowridge CPU model
# gpg: Signature made Fri 29 Oct 2021 12:05:14 PM PDT
# gpg: using RSA key 5A322FD5ABC4D3DBACCFD1AA2807936F984DC5A6
# gpg: issuer "ehabkost@redhat.com"
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" [full]
* remotes/ehabkost/tags/x86-next-pull-request:
target/i386: Remove core-capability in Snowridge CPU model
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
| -rw-r--r-- | target/i386/cpu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/target/i386/cpu.c b/target/i386/cpu.c index fc3ed80ef1..598d451dcf 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -3749,9 +3749,10 @@ static const X86CPUDefinition builtin_x86_defs[] = { }, { .version = 4, - .note = "no split lock detect", + .note = "no split lock detect, no core-capability", .props = (PropValue[]) { { "split-lock-detect", "off" }, + { "core-capability", "off" }, { /* end of list */ }, }, }, |