ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target-i386: Rename KVM auto-feature-enable compat function 

The x86_cpu_compat_disable_kvm_features() name was a bit confusing, as
it won't forcibly disable the feature for all CPU models (i.e. add it to
kvm_default_unset_features), but it will instead turn off the KVM
auto-enabling of the feature (i.e. remove it from kvm_default_features),
meaning the feature may still be enabled by default in some CPU models).

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Eduardo Habkost 2014-10-03 16:39:47 -03:00 committed by Andreas Färber
parent 179b9f40f2
commit 1cadaa9482
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/i386/pc_piix.c
View File

@ -338,7 +338,7 @@ static void pc_compat_1_7(MachineState *machine)
gigabyte_align = false; gigabyte_align = false;
option_rom_has_mr = true; option_rom_has_mr = true;
legacy_acpi_table_size = 6414; legacy_acpi_table_size = 6414;
x86_cpu_compat_disable_kvm_features(FEAT_1_ECX, CPUID_EXT_X2APIC); x86_cpu_compat_kvm_no_autoenable(FEAT_1_ECX, CPUID_EXT_X2APIC);
} }
static void pc_compat_1_6(MachineState *machine) static void pc_compat_1_6(MachineState *machine)
@ -370,7 +370,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_disable_kvm_features(FEAT_KVM, KVM_FEATURE_PV_EOI); x86_cpu_compat_kvm_no_autoenable(FEAT_KVM, KVM_FEATURE_PV_EOI);
} }
static void pc_init_pci_2_1(MachineState *machine) static void pc_init_pci_2_1(MachineState *machine)
@ -441,7 +441,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_disable_kvm_features(FEAT_KVM, KVM_FEATURE_PV_EOI); x86_cpu_compat_kvm_no_autoenable(FEAT_KVM, KVM_FEATURE_PV_EOI);
enable_compat_apic_id_mode(); enable_compat_apic_id_mode();
pc_init1(machine, 0, 1); pc_init1(machine, 0, 1);
} }

2
hw/i386/pc_q35.c
View File

@ -299,7 +299,7 @@ static void pc_compat_1_7(MachineState *machine)
smbios_defaults = false; smbios_defaults = false;
gigabyte_align = false; gigabyte_align = false;
option_rom_has_mr = true; option_rom_has_mr = true;
x86_cpu_compat_disable_kvm_features(FEAT_1_ECX, CPUID_EXT_X2APIC); x86_cpu_compat_kvm_no_autoenable(FEAT_1_ECX, CPUID_EXT_X2APIC);
} }
static void pc_compat_1_6(MachineState *machine) static void pc_compat_1_6(MachineState *machine)

2
target-i386/cpu.c
View File

@ -462,7 +462,7 @@ static uint32_t kvm_default_unset_features[FEATURE_WORDS] = {
[FEAT_1_ECX] = CPUID_EXT_MONITOR, [FEAT_1_ECX] = CPUID_EXT_MONITOR,
}; };
void x86_cpu_compat_disable_kvm_features(FeatureWord w, uint32_t features) void x86_cpu_compat_kvm_no_autoenable(FeatureWord w, uint32_t features)
{ {
kvm_default_features[w] &= ~features; kvm_default_features[w] &= ~features;
} }

2
target-i386/cpu.h
View File

@ -1365,7 +1365,7 @@ void cpu_report_tpr_access(CPUX86State *env, TPRAccess access);
void x86_cpu_compat_set_features(const char *cpu_model, FeatureWord w, void x86_cpu_compat_set_features(const char *cpu_model, FeatureWord w,
uint32_t feat_add, uint32_t feat_remove); uint32_t feat_add, uint32_t feat_remove);
void x86_cpu_compat_disable_kvm_features(FeatureWord w, uint32_t features); void x86_cpu_compat_kvm_no_autoenable(FeatureWord w, uint32_t features);
/* Return name of 32-bit register, from a R_* constant */ /* Return name of 32-bit register, from a R_* constant */