diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-11-06 10:10:15 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-11-06 10:10:15 +0000 |
| commit | 574418132355bae50e829eb7890c8ea5dcb53fd8 (patch) | |
| tree | 399a589a31e92ff01bdff294acb99f07f58d822d /include | |
| parent | 496c1b19facc7b850fa0c09899fcc07a0702fbfd (diff) | |
| parent | f7fda280948a5e74aeb076ef346b991ecb173c56 (diff) | |
| download | qemu-574418132355bae50e829eb7890c8ea5dcb53fd8.zip qemu-574418132355bae50e829eb7890c8ea5dcb53fd8.tar.gz qemu-574418132355bae50e829eb7890c8ea5dcb53fd8.tar.bz2 | |
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging
X86 queue, 2015-11-05
# gpg: Signature made Thu 05 Nov 2015 19:35:31 GMT using RSA key ID 984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
* remotes/ehabkost/tags/x86-pull-request:
target-i386: Enable clflushopt/clwb/pcommit instructions
target-i386: Remove POPCNT from qemu64 and qemu32 CPU models
target-i386: Remove ABM from qemu64 CPU model
target-i386: Remove SSE4a from qemu64 CPU model
target-i386: Set "check=off" by default on pc-*-2.4 and older
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/i386/pc.h | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 606dbc2..4bbc0ff 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -322,6 +322,31 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); .driver = "host" "-" TYPE_X86_CPU,\ .property = "host-cache-info",\ .value = "on",\ + },\ + {\ + .driver = TYPE_X86_CPU,\ + .property = "check",\ + .value = "off",\ + },\ + {\ + .driver = "qemu64" "-" TYPE_X86_CPU,\ + .property = "sse4a",\ + .value = "on",\ + },\ + {\ + .driver = "qemu64" "-" TYPE_X86_CPU,\ + .property = "abm",\ + .value = "on",\ + },\ + {\ + .driver = "qemu64" "-" TYPE_X86_CPU,\ + .property = "popcnt",\ + .value = "on",\ + },\ + {\ + .driver = "qemu32" "-" TYPE_X86_CPU,\ + .property = "popcnt",\ + .value = "on",\ }, #define PC_COMPAT_2_3 \ |