From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39870) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxLyK-00046f-OT for qemu-devel@nongnu.org; Wed, 18 Jun 2014 15:56:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WxLyE-0001pz-H8 for qemu-devel@nongnu.org; Wed, 18 Jun 2014 15:56:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34628) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxLyE-0001pu-8Y for qemu-devel@nongnu.org; Wed, 18 Jun 2014 15:56:34 -0400 From: Eduardo Habkost Date: Wed, 18 Jun 2014 16:55:57 -0300 Message-Id: <1403121359-4275-2-git-send-email-ehabkost@redhat.com> In-Reply-To: <1403121359-4275-1-git-send-email-ehabkost@redhat.com> References: <1403121359-4275-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [qom-cpu PATCH 1/3] target-i386: Disable CPUID_ACPI by default on KVM mode List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= Cc: Igor Mammedov , Aurelien Jarno , kvm@vger.kernel.org, "Michael S. Tsirkin" KVM never supported the CPUID_ACPI flag, so it doesn't make sense to have it enabled by default when KVM is enabled. The motivation here is exactly the same we had for the MONITOR flag. And like on the MONITOR flag case, we don't need machine-type compat code because it is currently impossible to run a KVM VM with the ACPI flag set. Signed-off-by: Eduardo Habkost --- target-i386/cpu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index de09ca2..8de1566 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -461,6 +461,7 @@ static uint32_t kvm_default_features[FEATURE_WORDS] = { /* Features that are not added by default to any CPU model when KVM is enabled. */ static uint32_t kvm_default_unset_features[FEATURE_WORDS] = { + [FEAT_1_EDX] = CPUID_ACPI, [FEAT_1_ECX] = CPUID_EXT_MONITOR, }; -- 1.9.3