diff options
| author | Peter Maydell | 2018-01-18 13:59:22 +0100 |
|---|---|---|
| committer | Peter Maydell | 2018-01-18 13:59:24 +0100 |
| commit | 5cad8ca516011695a37d5be905292722b5249da8 (patch) | |
| tree | e4af4d139dc1024745cfa95fe27450f08e2288d5 /include | |
| parent | Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.12-20180117' int... (diff) | |
| parent | i386: Add EPYC-IBPB CPU model (diff) | |
| download | qemu-5cad8ca516011695a37d5be905292722b5249da8.tar.gz qemu-5cad8ca516011695a37d5be905292722b5249da8.tar.xz qemu-5cad8ca516011695a37d5be905292722b5249da8.zip | |
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging
x86 queue, 2018-01-17
Highlight: new CPU models that expose CPU features that guests
can use to mitigate CVE-2017-5715 (Spectre variant #2).
# gpg: Signature made Thu 18 Jan 2018 02:00:03 GMT
# gpg: using RSA key 0x2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6
* remotes/ehabkost/tags/x86-pull-request:
i386: Add EPYC-IBPB CPU model
i386: Add new -IBRS versions of Intel CPU models
i386: Add FEAT_8000_0008_EBX CPUID feature word
i386: Add spec-ctrl CPUID bit
i386: Add support for SPEC_CTRL MSR
i386: Change X86CPUDefinition::model_id to const char*
target/i386: add clflushopt to "Skylake-Server" cpu model
pc: add 2.12 machine types
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/i386/pc.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 6f77eb0665..bb49165fe0 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -321,6 +321,14 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t); int e820_get_num_entries(void); bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); +#define PC_COMPAT_2_11 \ + HW_COMPAT_2_11 \ + {\ + .driver = "Skylake-Server" "-" TYPE_X86_CPU,\ + .property = "clflushopt",\ + .value = "off",\ + }, + #define PC_COMPAT_2_10 \ HW_COMPAT_2_10 \ {\ |