diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-07-07 20:12:55 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-07-07 20:12:55 +0100 |
| commit | 1a632032d1ea09a09dc424ac2b10a4a11cd52ab9 (patch) | |
| tree | c2d9f0f3d53c571be847a5f4df90ed0f6d6e279f /target-i386/kvm.c | |
| parent | 30c6672aa4b4bc9bdba3a7e46c49bba191660143 (diff) | |
| parent | 06ef227e5158cca6710e6c268d6a7f65a5e2811b (diff) | |
| download | focaccia-qemu-1a632032d1ea09a09dc424ac2b10a4a11cd52ab9.tar.gz focaccia-qemu-1a632032d1ea09a09dc424ac2b10a4a11cd52ab9.zip | |
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging
X86 queue, 2015-07-07 Patch "target-i386: emulate CPUID level of real hardware" was removed after the 2015-07-03 pull request. # gpg: Signature made Tue Jul 7 15:46:23 2015 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: avoid overflow in the tsc-frequency property i386: Introduce ARAT CPU feature Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target-i386/kvm.c')
| -rw-r--r-- | target-i386/kvm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 9038bf7077..066d03d99e 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -238,6 +238,8 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s, uint32_t function, if (!kvm_irqchip_in_kernel()) { ret &= ~CPUID_EXT_X2APIC; } + } else if (function == 6 && reg == R_EAX) { + ret |= CPUID_6_EAX_ARAT; /* safe to allow because of emulated APIC */ } else if (function == 0x80000001 && reg == R_EDX) { /* On Intel, kvm returns cpuid according to the Intel spec, * so add missing bits according to the AMD spec: |