diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-03-02 11:18:01 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-03-02 11:18:01 +0000 |
| commit | 666095c852d32df65b5982fcc8c85332979b7fc1 (patch) | |
| tree | fa96453e01d3fe8be44687b1247e8aa1d387b41a /target/i386/cpu.h | |
| parent | f1d640524d0557f78343504c3b128d412f573f28 (diff) | |
| parent | b8097deb359bbbd92592b9670adfe9e245b2d0bd (diff) | |
| download | qemu-666095c852d32df65b5982fcc8c85332979b7fc1.zip qemu-666095c852d32df65b5982fcc8c85332979b7fc1.tar.gz qemu-666095c852d32df65b5982fcc8c85332979b7fc1.tar.bz2 | |
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging
x86 queue, 2017-02-27
"-cpu max" and query-cpu-model-expansion support for x86. This
should be the last x86 pull request before 2.9 soft freeze.
# gpg: Signature made Mon 27 Feb 2017 16:24:15 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: Improve query-cpu-model-expansion full mode
i386: Implement query-cpu-model-expansion QMP command
i386: Define static "base" CPU model
i386: Don't set CPUClass::cpu_def on "max" model
i386: Make "max" model not use any host CPUID info on TCG
i386: Create "max" CPU model
qapi-schema: Comment about full expansion of non-migration-safe models
i386: Reorganize and document CPUID initialization steps
i386: Rename X86CPU::host_features to X86CPU::max_features
i386: Add ordering field to CPUClass
i386: Unset cannot_destroy_with_object_finalize_yet on "host" model
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target/i386/cpu.h')
| -rw-r--r-- | target/i386/cpu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 573f2aa..12a39d5 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1211,7 +1211,7 @@ struct X86CPU { bool enforce_cpuid; bool expose_kvm; bool migratable; - bool host_features; + bool max_features; /* Enable all supported features automatically */ uint32_t apic_id; /* Enables publishing of TSC increment and Local APIC bus frequencies to |