diff options
| author | Peter Maydell | 2015-11-17 23:00:45 +0100 |
|---|---|---|
| committer | Peter Maydell | 2015-11-17 23:00:46 +0100 |
| commit | 55db5eeeb7aa3328515817dc4e45728580e517a0 (patch) | |
| tree | 34f2c236edcf7d82af1cd2cad3970bf15f803c47 /include | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-20151116-1' into s... (diff) | |
| parent | target-i386: Disable rdtscp on Opteron_G* CPU models (diff) | |
| download | qemu-55db5eeeb7aa3328515817dc4e45728580e517a0.tar.gz qemu-55db5eeeb7aa3328515817dc4e45728580e517a0.tar.xz qemu-55db5eeeb7aa3328515817dc4e45728580e517a0.zip | |
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging
X86 fixes, 2015-11-17
Two X86 fixes, hopefully in time for -rc1.
# gpg: Signature made Tue 17 Nov 2015 19:06:53 GMT using RSA key ID 984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
* remotes/ehabkost/tags/x86-pull-request:
target-i386: Disable rdtscp on Opteron_G* CPU models
target-i386: Fix mulx for identical target regs
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/i386/pc.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 4bbc0ffc53..854c330b66 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -347,8 +347,25 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); .driver = "qemu32" "-" TYPE_X86_CPU,\ .property = "popcnt",\ .value = "on",\ + },{\ + .driver = "Opteron_G2" "-" TYPE_X86_CPU,\ + .property = "rdtscp",\ + .value = "on",\ + },{\ + .driver = "Opteron_G3" "-" TYPE_X86_CPU,\ + .property = "rdtscp",\ + .value = "on",\ + },{\ + .driver = "Opteron_G4" "-" TYPE_X86_CPU,\ + .property = "rdtscp",\ + .value = "on",\ + },{\ + .driver = "Opteron_G5" "-" TYPE_X86_CPU,\ + .property = "rdtscp",\ + .value = "on",\ }, + #define PC_COMPAT_2_3 \ PC_COMPAT_2_4 \ HW_COMPAT_2_3 \ |