From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59576) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aeS6Z-000209-4L for qemu-devel@nongnu.org; Fri, 11 Mar 2016 13:48:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aeS6Y-0002sx-1y for qemu-devel@nongnu.org; Fri, 11 Mar 2016 13:48:07 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43797) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aeS6X-0002sn-Sq for qemu-devel@nongnu.org; Fri, 11 Mar 2016 13:48:05 -0500 From: Eduardo Habkost Date: Fri, 11 Mar 2016 15:47:54 -0300 Message-Id: <1457722074-25406-3-git-send-email-ehabkost@redhat.com> In-Reply-To: <1457722074-25406-1-git-send-email-ehabkost@redhat.com> References: <1457722074-25406-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PULL 2/2] kvm: Remove x2apic feature from CPU model when kernel_irqchip is off List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: qemu-devel@nongnu.org, Paolo Bonzini , Lan Tianyu , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Richard Henderson From: Lan Tianyu x2apic feature is in the kvm_default_props and automatically added to all CPU models when KVM is enabled. But userspace devices don't support x2apic which can't be enabled without the in-kernel irqchip. It will trigger warning of "host doesn't support requested feature: CPUID.01H:ECX.x2apic [bit 21]" when kernel_irqchip is off. This patch is to fix it via removing x2apic feature when kernel_irqchip is off. Signed-off-by: Lan Tianyu Acked-by: Paolo Bonzini Reviewed-by: Eduardo Habkost Signed-off-by: Eduardo Habkost --- target-i386/cpu.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 0f38d1e..3ea6b29 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2132,6 +2132,10 @@ static void x86_cpu_load_def(X86CPU *cpu, X86CPUDefinition *def, Error **errp) /* Special cases not set in the X86CPUDefinition structs: */ if (kvm_enabled()) { + if (!kvm_irqchip_in_kernel()) { + x86_cpu_change_kvm_default("x2apic", "off"); + } + x86_cpu_apply_props(cpu, kvm_default_props); } -- 2.1.0