mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pc: fix KVM features in pc-1.3 and earlier machine types

Browse Source 
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 <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2015-01-14 17:53:55 +01:00
parent a46b3aaf6b
commit 0034a0f239
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/i386/pc_piix.c
View File

@ -406,7 +406,7 @@ static void pc_compat_1_3(MachineState *machine)
static void pc_compat_1_2(MachineState *machine) static void pc_compat_1_2(MachineState *machine)
{ {
pc_compat_1_3(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) static void pc_init_pci_2_2(MachineState *machine)
@ -483,7 +483,7 @@ static void pc_init_isa(MachineState *machine)
if (!machine->cpu_model) { if (!machine->cpu_model) {
machine->cpu_model = "486"; 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(); enable_compat_apic_id_mode();
pc_init1(machine, 0, 1); pc_init1(machine, 0, 1);
} }