diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-06-15 16:12:19 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-06-15 16:12:19 +0100 |
| commit | 5deaac15bf4fe1cb21c07680c92e8a8b2e684790 (patch) | |
| tree | 93f8cb2d0e7cb834f4eee140619f8eaa03f193f2 /include/hw | |
| parent | 49237b856ae58ee7955be0b959c504c51b014f20 (diff) | |
| parent | f6750e959a397dea988efd4e488e1ff813011065 (diff) | |
| download | focaccia-qemu-5deaac15bf4fe1cb21c07680c92e8a8b2e684790.tar.gz focaccia-qemu-5deaac15bf4fe1cb21c07680c92e8a8b2e684790.zip | |
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging
X86 queue, 2016-06-14 (v2) # gpg: Signature made Tue 14 Jun 2016 22:29:04 BST # 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: target-i386: Consolidate calls of object_property_parse() in x86_cpu_parse_featurestr target-i386: Use cpu_generic_init() in cpu_x86_init() target-i386: Move xcc->kvm_required check to realize time target-i386: Remove assert(kvm_enabled()) from host_x86_cpu_initfn() target-i386: Move features logic that requires CPUState to realize time target-i386: Remove xlevel & hv-spinlocks option fixups target-i386: Implement CPUID[0xB] (Extended Topology Enumeration) pc: Add 2.7 machine target-i386: add Skylake-Client cpu model Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw')
| -rw-r--r-- | include/hw/i386/pc.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 9ca23098bd..49566c89d4 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -356,7 +356,16 @@ 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_6 \ + HW_COMPAT_2_6 \ + {\ + .driver = TYPE_X86_CPU,\ + .property = "cpuid-0xb",\ + .value = "off",\ + }, + #define PC_COMPAT_2_5 \ + PC_COMPAT_2_6 \ HW_COMPAT_2_5 /* Helper for setting model-id for CPU models that changed model-id |