diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-11-01 16:32:54 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-11-01 16:32:54 +0000 |
| commit | 00878c95165de8ffc015a43e14249d789de1b8ff (patch) | |
| tree | 2bc4a0f0acc53fe041db066abe7a3e5bf45135fd /include/hw/i386/pc.h | |
| parent | 60126df95f142c3d5cf0d11cd5d17f1bf9589743 (diff) | |
| parent | 09b9ee643f90ef95e30e594df2a3c83ccaf75b1f (diff) | |
| download | focaccia-qemu-00878c95165de8ffc015a43e14249d789de1b8ff.tar.gz focaccia-qemu-00878c95165de8ffc015a43e14249d789de1b8ff.zip | |
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-next-pull-request' into staging
x86 queue, 2018-10-30 * MSR-based feature support for MSR_IA32_ARCH_CAPABILITIES bits (Robert Hoo) * Cascadelake-Server CPU model (Tao Xu) * Add PKU on Skylake-Server CPU model (Tao Xu) * Correct cpu_x86_cpuid(0xd) (Sebastian Andrzej Siewior) * Remove dead code (Peter Maydell) # gpg: Signature made Wed 31 Oct 2018 14:05:25 GMT # gpg: using RSA key 2807936F984DC5A6 # 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-next-pull-request: i386: Add PKU on Skylake-Server CPU model i386: Add new model of Cascadelake-Server x86: define a new MSR based feature word -- FEATURE_WORDS_ARCH_CAPABILITIES x86: Data structure changes to support MSR based features kvm: Add support to KVM_GET_MSR_FEATURE_INDEX_LIST and KVM_GET_MSRS system ioctl target/i386: Remove #ifdeffed-out icebp debugging hack i386: correct cpu_x86_cpuid(0xd) Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/i386/pc.h')
| -rw-r--r-- | include/hw/i386/pc.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index dfe6746692..136fe497b6 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -300,7 +300,15 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); .driver = TYPE_X86_CPU,\ .property = "x-hv-synic-kvm-only",\ .value = "on",\ - } + },{\ + .driver = "Skylake-Server" "-" TYPE_X86_CPU,\ + .property = "pku",\ + .value = "off",\ + },{\ + .driver = "Skylake-Server-IBRS" "-" TYPE_X86_CPU,\ + .property = "pku",\ + .value = "off",\ + }, #define PC_COMPAT_2_12 \ HW_COMPAT_2_12 \ |