[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v3 33/35] pc: Eliminate empty or trivial compat functi
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [RFC v3 33/35] pc: Eliminate empty or trivial compat functions |
Date: |
Fri, 4 Jul 2014 21:10:00 -0300 |
When all a compat function does is to call the previous compat function,
we don't need to set compat_func, as the previous class_init function
already set it.
Signed-off-by: Eduardo Habkost <address@hidden>
---
hw/i386/pc_piix.c | 29 +----------------------------
hw/i386/pc_q35.c | 21 +--------------------
2 files changed, 2 insertions(+), 48 deletions(-)
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 24bc59b..94e9dfe 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -279,29 +279,14 @@ static void pc_init1(MachineState *machine)
}
}
-static void pc_compat_2_0(MachineState *machine)
-{
-}
-
static void pc_compat_1_7(MachineState *machine)
{
- pc_compat_2_0(machine);
x86_cpu_compat_disable_kvm_features(FEAT_1_ECX, CPUID_EXT_X2APIC);
}
-static void pc_compat_1_6(MachineState *machine)
-{
- pc_compat_1_7(machine);
-}
-
-static void pc_compat_1_5(MachineState *machine)
-{
- pc_compat_1_6(machine);
-}
-
static void pc_compat_1_4(MachineState *machine)
{
- pc_compat_1_5(machine);
+ pc_compat_1_7(machine);
x86_cpu_compat_set_features("n270", FEAT_1_ECX, 0, CPUID_EXT_MOVBE);
x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0,
CPUID_EXT_PCLMULQDQ);
}
@@ -312,19 +297,12 @@ static void pc_compat_1_3(MachineState *machine)
enable_compat_apic_id_mode();
}
-/* PC compat function for pc-0.14 to pc-1.2 */
static void pc_compat_1_2(MachineState *machine)
{
pc_compat_1_3(machine);
x86_cpu_compat_disable_kvm_features(FEAT_KVM, KVM_FEATURE_PV_EOI);
}
-/* PC compat function for pc-0.10 to pc-0.13 */
-static void pc_compat_0_13(MachineState *machine)
-{
- pc_compat_1_2(machine);
-}
-
static void pc_compat_isa(MachineState *machine)
{
if (!machine->cpu_model) {
@@ -409,7 +387,6 @@ static void pc_i440fx_machine_v2_0_class_init(ObjectClass
*oc, void *data)
machine_class_add_compat_props(mc, compat_props);
pcmc->smbios_legacy_mode = true;
pcmc->has_reserved_memory = false;
- pcmc->compat_func = pc_compat_2_0;
}
static const TypeInfo pc_i440fx_machine_v2_0_type_info = {
@@ -455,7 +432,6 @@ static void pc_i440fx_machine_v1_6_class_init(ObjectClass
*oc, void *data)
mc->rom_file_has_mr = false;
machine_class_add_compat_props(mc, compat_props);
pcmc->has_acpi_build = false;
- pcmc->compat_func = pc_compat_1_6;
}
static const TypeInfo pc_i440fx_machine_v1_6_type_info = {
@@ -467,7 +443,6 @@ static const TypeInfo pc_i440fx_machine_v1_6_type_info = {
static void pc_i440fx_machine_v1_5_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
- PCMachineClass *pcmc = PC_MACHINE_CLASS(oc);
static GlobalProperty compat_props[] = {
PC_COMPAT_1_5,
{ /* end of list */ }
@@ -475,7 +450,6 @@ static void pc_i440fx_machine_v1_5_class_init(ObjectClass
*oc, void *data)
pc_i440fx_machine_v1_6_class_init(oc, data);
mc->name = "pc-i440fx-1.5";
machine_class_add_compat_props(mc, compat_props);
- pcmc->compat_func = pc_compat_1_5;
}
static const TypeInfo pc_i440fx_machine_v1_5_type_info = {
@@ -775,7 +749,6 @@ static void pc_machine_v0_13_class_init(ObjectClass *oc,
void *data)
mc->hw_version = "0.13";
mc->name = "pc-0.13";
machine_class_add_compat_props(mc, compat_props);
- pcmc->compat_func = pc_compat_0_13;
pcmc->kvmclock_enabled = false;
}
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 5ed9a16..d978567 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -263,29 +263,14 @@ static void pc_q35_init(MachineState *machine)
}
}
-static void pc_compat_2_0(MachineState *machine)
-{
-}
-
static void pc_compat_1_7(MachineState *machine)
{
- pc_compat_2_0(machine);
x86_cpu_compat_disable_kvm_features(FEAT_1_ECX, CPUID_EXT_X2APIC);
}
-static void pc_compat_1_6(MachineState *machine)
-{
- pc_compat_1_7(machine);
-}
-
-static void pc_compat_1_5(MachineState *machine)
-{
- pc_compat_1_6(machine);
-}
-
static void pc_compat_1_4(MachineState *machine)
{
- pc_compat_1_5(machine);
+ pc_compat_1_7(machine);
x86_cpu_compat_set_features("n270", FEAT_1_ECX, 0, CPUID_EXT_MOVBE);
x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0,
CPUID_EXT_PCLMULQDQ);
}
@@ -338,7 +323,6 @@ static void pc_q35_machine_v2_0_class_init(ObjectClass *oc,
void *data)
mc->name = "pc-q35-2.0";
pcmc->smbios_legacy_mode = true;
pcmc->has_reserved_memory = false;
- pcmc->compat_func = pc_compat_2_0;
}
static TypeInfo pc_q35_machine_v2_0_type_info = {
@@ -383,7 +367,6 @@ static void pc_q35_machine_v1_6_class_init(ObjectClass *oc,
void *data)
mc->rom_file_has_mr = false;
machine_class_add_compat_props(mc, compat_props);
mc->name = "pc-q35-1.6";
- pcmc->compat_func = pc_compat_1_6;
pcmc->has_acpi_build = false;
}
@@ -396,7 +379,6 @@ static TypeInfo pc_q35_machine_v1_6_type_info = {
static void pc_q35_machine_v1_5_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
- PCMachineClass *pcmc = PC_MACHINE_CLASS(oc);
static GlobalProperty compat_props[] = {
PC_COMPAT_1_5,
{ /* end of list */ }
@@ -404,7 +386,6 @@ static void pc_q35_machine_v1_5_class_init(ObjectClass *oc,
void *data)
pc_q35_machine_v1_6_class_init(oc, data);
machine_class_add_compat_props(mc, compat_props);
mc->name = "pc-q35-1.5";
- pcmc->compat_func = pc_compat_1_5;
}
static TypeInfo pc_q35_machine_v1_5_type_info = {
--
1.9.3
- [Qemu-devel] [RFC v3 22/35] pc: Move kvmclock_enabled to PCMachineClass, (continued)
- [Qemu-devel] [RFC v3 22/35] pc: Move kvmclock_enabled to PCMachineClass, Eduardo Habkost, 2014/07/04
- [Qemu-devel] [RFC v3 23/35] pc: Move smbios_legacy_mode to PCMachineClass, Eduardo Habkost, 2014/07/04
- [Qemu-devel] [RFC v3 24/35] pc: Move smbios_defaults to PCMachineClass, Eduardo Habkost, 2014/07/04
- [Qemu-devel] [RFC v3 25/35] pc: Move has_acpi_build to PCMachineClass, Eduardo Habkost, 2014/07/04
- [Qemu-devel] [RFC v3 26/35] pc: Move has_pci_info to PCMachineClass, Eduardo Habkost, 2014/07/04
- [Qemu-devel] [RFC v3 27/35] pc: Move gigabyte_align to PCMachineClass, Eduardo Habkost, 2014/07/04
- [Qemu-devel] [RFC v3 28/35] pc: Move has_reserved_memory to PCMachineClass, Eduardo Habkost, 2014/07/04
- [Qemu-devel] [RFC v3 30/35] piix: Eliminate pc_init_pci(), Eduardo Habkost, 2014/07/04
- [Qemu-devel] [RFC v3 29/35] pc: Move option_rom_has_mr/rom_file_has_mr to MachineClass, Eduardo Habkost, 2014/07/04
- [Qemu-devel] [RFC v3 31/35] piix: Introduce struct PCI440FXMachineClass, Eduardo Habkost, 2014/07/04
- [Qemu-devel] [RFC v3 33/35] pc: Eliminate empty or trivial compat functions,
Eduardo Habkost <=
- [Qemu-devel] [RFC v3 32/35] pc: Create common machine init function, Eduardo Habkost, 2014/07/04
- [Qemu-devel] [RFC v3 34/35] piix: Move compat/init functions closer to corresponding class_init, Eduardo Habkost, 2014/07/04
- [Qemu-devel] [RFC v3 35/35] pc: Move {ram, pci, rom}_memory variables to PCMachineState, Eduardo Habkost, 2014/07/04