Commit 2be4f242 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 426d0e7b 27751aab

include/hw/i386/pc.h

+4 −0
Original line number Diff line number Diff line
@@ -350,6 +350,10 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); 
            .driver   = "SandyBridge" "-" TYPE_X86_CPU,\

            .property = "xlevel",\

            .value    = stringify(0x8000000a),\

        },{\

            .driver   = "IvyBridge" "-" TYPE_X86_CPU,\

            .property = "xlevel",\

            .value    = stringify(0x8000000a),\

        },{\

            .driver   = "Haswell" "-" TYPE_X86_CPU,\

            .property = "xlevel",\