diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-08-16 13:03:15 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-08-16 13:03:16 +0100 |
| commit | 725092ede525bee957b1a9cbe37ed618130dbb25 (patch) | |
| tree | d4562242a448d0b751f05c447ce22ebcd2da9ccb | |
| parent | 1f8b56e7cebc71d80aec27a4760024b56acc957a (diff) | |
| parent | 648774779aa6cdf755a296d1a15849ced51072f1 (diff) | |
| download | qemu-725092ede525bee957b1a9cbe37ed618130dbb25.tar.gz | |
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging
target-i386: kernel_irqchip=off fix for KVM
# gpg: Signature made Tue 16 Aug 2016 12:55:42 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: kvm: Report kvm_pv_unhalt as unsupported w/o kernel_irqchip
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | target-i386/kvm.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 0b2016a77a..d1a25c5465 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -329,6 +329,13 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s, uint32_t function, */ cpuid_1_edx = kvm_arch_get_supported_cpuid(s, 1, 0, R_EDX); ret |= cpuid_1_edx & CPUID_EXT2_AMD_ALIASES; + } else if (function == KVM_CPUID_FEATURES && reg == R_EAX) { + /* kvm_pv_unhalt is reported by GET_SUPPORTED_CPUID, but it can't + * be enabled without the in-kernel irqchip + */ + if (!kvm_irqchip_in_kernel()) { + ret &= ~(1U << KVM_FEATURE_PV_UNHALT); + } } /* fallback for older kernels */ |