From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51687) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YFfua-0007G1-Lb for qemu-devel@nongnu.org; Mon, 26 Jan 2015 04:24:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YFfuR-0005kx-KX for qemu-devel@nongnu.org; Mon, 26 Jan 2015 04:24:48 -0500 Received: from mail-wg0-x22d.google.com ([2a00:1450:400c:c00::22d]:36064) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YFfuR-0005kD-E6 for qemu-devel@nongnu.org; Mon, 26 Jan 2015 04:24:39 -0500 Received: by mail-wg0-f45.google.com with SMTP id x12so7852612wgg.4 for ; Mon, 26 Jan 2015 01:24:38 -0800 (PST) Received: from playground.station (net-2-35-193-154.cust.vodafonedsl.it. [2.35.193.154]) by mx.google.com with ESMTPSA id 7sm13482382wjq.29.2015.01.26.01.24.37 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Jan 2015 01:24:37 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 26 Jan 2015 10:24:12 +0100 Message-Id: <1422264270-19278-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1422264270-19278-1-git-send-email-pbonzini@redhat.com> References: <1422264270-19278-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 01/19] pc: fix KVM features in pc-1.3 and earlier machine types List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Due to a typo, instead of disabling KVM_FEATURE_PV_EOI (bit 6) these machine types are disabling bits 1 and 2, which are KVM_FEATURE_NOP_IO_DELAY and KVM_FEATURE_MMU_OP. Not a big deal because they aren't very important and KVM_FEATURE_MMU_OP is disabled anyway. The worst part is actually that KVM_FEATURE_PV_EOI is remaining enabled. Signed-off-by: Paolo Bonzini --- hw/i386/pc_piix.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index f0a3201..97a754e 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -406,7 +406,7 @@ static void pc_compat_1_3(MachineState *machine) static void pc_compat_1_2(MachineState *machine) { pc_compat_1_3(machine); - x86_cpu_compat_kvm_no_autoenable(FEAT_KVM, KVM_FEATURE_PV_EOI); + x86_cpu_compat_kvm_no_autoenable(FEAT_KVM, 1 << KVM_FEATURE_PV_EOI); } static void pc_init_pci_2_2(MachineState *machine) @@ -483,7 +483,7 @@ static void pc_init_isa(MachineState *machine) if (!machine->cpu_model) { machine->cpu_model = "486"; } - x86_cpu_compat_kvm_no_autoenable(FEAT_KVM, KVM_FEATURE_PV_EOI); + x86_cpu_compat_kvm_no_autoenable(FEAT_KVM, 1 << KVM_FEATURE_PV_EOI); enable_compat_apic_id_mode(); pc_init1(machine, 0, 1); } -- 1.8.3.1