From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33740) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bZczq-0004jc-BI for qemu-devel@nongnu.org; Tue, 16 Aug 2016 07:57:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bZczp-0001D3-J8 for qemu-devel@nongnu.org; Tue, 16 Aug 2016 07:57:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43778) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bZczp-0001Cy-DL for qemu-devel@nongnu.org; Tue, 16 Aug 2016 07:57:29 -0400 From: Eduardo Habkost Date: Tue, 16 Aug 2016 08:57:13 -0300 Message-Id: <1471348633-22174-2-git-send-email-ehabkost@redhat.com> In-Reply-To: <1471348633-22174-1-git-send-email-ehabkost@redhat.com> References: <1471348633-22174-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PULL 1/1] target-i386: kvm: Report kvm_pv_unhalt as unsupported w/o kernel_irqchip List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: Paolo Bonzini , peterx@redhat.com, Richard Henderson , Marcel Apfelbaum , qemu-devel@nongnu.org The kvm_pv_unhalt feature doesn't work if kernel_irqchip is disabled, so we need to report it as unsupported. Tested-by: Peter Xu Reviewed-by: Andrew Jones Signed-off-by: Eduardo Habkost --- target-i386/kvm.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 0b2016a..d1a25c5 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 */ -- 2.7.4