diff options
| author | Peter Maydell | 2016-10-04 12:28:30 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-10-04 12:28:30 +0200 |
| commit | 1bb47107057c645945971cf4e13eb8b524915b71 (patch) | |
| tree | d86bb160da14b08544469560372c16967debb995 /include | |
| parent | Merge remote-tracking branch 'remotes/famz/tags/for-upstream' into staging (diff) | |
| parent | target-i386: Correct family/model/stepping for Opteron_G3 (diff) | |
| download | qemu-1bb47107057c645945971cf4e13eb8b524915b71.tar.gz qemu-1bb47107057c645945971cf4e13eb8b524915b71.tar.xz qemu-1bb47107057c645945971cf4e13eb8b524915b71.zip | |
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging
x86 bug fixes
Fix for a XSAVE regression when using "-cpu host", and a fix on
the Opteron_G3 CPU model.
# gpg: Signature made Mon 03 Oct 2016 20:08:13 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: Correct family/model/stepping for Opteron_G3
target-i386: Report known CPUID[EAX=0xD,ECX=0]:EAX bits as migratable
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/i386/pc.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 47bdf10cfd..cb2df83b2c 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -379,6 +379,21 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); .driver = TYPE_X86_CPU,\ .property = "full-cpuid-auto-level",\ .value = "off",\ + },\ + {\ + .driver = "Opteron_G3" "-" TYPE_X86_CPU,\ + .property = "family",\ + .value = "15",\ + },\ + {\ + .driver = "Opteron_G3" "-" TYPE_X86_CPU,\ + .property = "model",\ + .value = "6",\ + },\ + {\ + .driver = "Opteron_G3" "-" TYPE_X86_CPU,\ + .property = "stepping",\ + .value = "1",\ }, #define PC_COMPAT_2_6 \ |