summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-08-04 16:51:24 +0100
committerPeter Maydell <peter.maydell@linaro.org>2015-08-04 16:51:24 +0100
commit2be4f242b50a84bf360df02480b173bfed161107 (patch)
tree7f0ee14a15217031aaf5a266e51b56b538c2fe97
parent426d0e7b7e031a1592292b3eb275483b341a2f28 (diff)
parent27751aabd1e0359d84314bc230beccdef2168d1f (diff)
downloadqemu-2be4f242b50a84bf360df02480b173bfed161107.tar.gz
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging
X86 queue, 2015-08-04 # gpg: Signature made Tue 04 Aug 2015 16:49:42 BST using RSA key ID 984DC5A6 # gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6 * remotes/ehabkost/tags/x86-pull-request: target-i386: fix IvyBridge xlevel in PC_COMPAT_2_3 Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--include/hw/i386/pc.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index c4165740cf..954203d227 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -351,6 +351,10 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
.property = "xlevel",\
.value = stringify(0x8000000a),\
},{\
+ .driver = "IvyBridge" "-" TYPE_X86_CPU,\
+ .property = "xlevel",\
+ .value = stringify(0x8000000a),\
+ },{\
.driver = "Haswell" "-" TYPE_X86_CPU,\
.property = "xlevel",\
.value = stringify(0x8000000a),\