[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 15/33] q35: Eliminate pc_q35_machine_options()
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH v4 15/33] q35: Eliminate pc_q35_machine_options() |
Date: |
Thu, 14 Aug 2014 16:25:44 -0300 |
Instead of calling it on every q35 class_init function, just register a
common parent class for all q35 machine-types.
Signed-off-by: Eduardo Habkost <address@hidden>
---
hw/i386/pc_q35.c | 34 ++++++++++++++++++----------------
1 file changed, 18 insertions(+), 16 deletions(-)
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 0074640..2aa1c43 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -341,15 +341,24 @@ static void pc_q35_init_1_4(MachineState *machine)
pc_q35_init(machine);
}
-static void pc_q35_machine_options(MachineClass *mc)
+static void pc_q35_machine_class_init(ObjectClass *oc, void *data)
{
+ MachineClass *mc = MACHINE_CLASS(oc);
mc->desc = "Standard PC (Q35 + ICH9, 2009)";
mc->hot_add_cpu = pc_hot_add_cpu;
}
+#define TYPE_PC_Q35_MACHINE "pc-q35" TYPE_MACHINE_SUFFIX
+
+static TypeInfo pc_q35_machine_type_info = {
+ .name = TYPE_PC_Q35_MACHINE,
+ .parent = TYPE_PC_MACHINE,
+ .class_init = pc_q35_machine_class_init,
+ .abstract = true,
+};
+
static void pc_q35_2_1_machine_options(MachineClass *mc)
{
- pc_q35_machine_options(mc);
mc->default_machine_opts = "firmware=bios-256k.bin";
}
@@ -364,7 +373,7 @@ static void pc_q35_machine_v2_1_class_init(ObjectClass *oc,
void *data)
static TypeInfo pc_q35_machine_v2_1_type_info = {
.name = "pc-q35-2.1" TYPE_MACHINE_SUFFIX,
- .parent = TYPE_PC_MACHINE,
+ .parent = TYPE_PC_Q35_MACHINE,
.class_init = pc_q35_machine_v2_1_class_init,
};
@@ -385,12 +394,10 @@ static void pc_q35_machine_v2_0_class_init(ObjectClass
*oc, void *data)
static TypeInfo pc_q35_machine_v2_0_type_info = {
.name = "pc-q35-2.0" TYPE_MACHINE_SUFFIX,
- .parent = TYPE_PC_MACHINE,
+ .parent = TYPE_PC_Q35_MACHINE,
.class_init = pc_q35_machine_v2_0_class_init,
};
-#define pc_q35_1_7_machine_options pc_q35_machine_options
-
static void pc_q35_machine_v1_7_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
@@ -398,7 +405,6 @@ static void pc_q35_machine_v1_7_class_init(ObjectClass *oc,
void *data)
PC_COMPAT_1_7,
{ /* end of list */ }
};
- pc_q35_1_7_machine_options(mc);
mc->init = pc_q35_init_1_7;
machine_class_add_compat_props(mc, compat_props);
mc->name = "pc-q35-1.7";
@@ -406,12 +412,10 @@ static void pc_q35_machine_v1_7_class_init(ObjectClass
*oc, void *data)
static TypeInfo pc_q35_machine_v1_7_type_info = {
.name = "pc-q35-1.7" TYPE_MACHINE_SUFFIX,
- .parent = TYPE_PC_MACHINE,
+ .parent = TYPE_PC_Q35_MACHINE,
.class_init = pc_q35_machine_v1_7_class_init,
};
-#define pc_q35_1_6_machine_options pc_q35_machine_options
-
static void pc_q35_machine_v1_6_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
@@ -419,7 +423,6 @@ static void pc_q35_machine_v1_6_class_init(ObjectClass *oc,
void *data)
PC_COMPAT_1_6,
{ /* end of list */ }
};
- pc_q35_1_6_machine_options(mc);
mc->init = pc_q35_init_1_6;
machine_class_add_compat_props(mc, compat_props);
mc->name = "pc-q35-1.6";
@@ -427,7 +430,7 @@ static void pc_q35_machine_v1_6_class_init(ObjectClass *oc,
void *data)
static TypeInfo pc_q35_machine_v1_6_type_info = {
.name = "pc-q35-1.6" TYPE_MACHINE_SUFFIX,
- .parent = TYPE_PC_MACHINE,
+ .parent = TYPE_PC_Q35_MACHINE,
.class_init = pc_q35_machine_v1_6_class_init,
};
@@ -438,7 +441,6 @@ static void pc_q35_machine_v1_5_class_init(ObjectClass *oc,
void *data)
PC_COMPAT_1_5,
{ /* end of list */ }
};
- pc_q35_1_6_machine_options(mc);
mc->init = pc_q35_init_1_5;
machine_class_add_compat_props(mc, compat_props);
mc->name = "pc-q35-1.5";
@@ -446,13 +448,12 @@ static void pc_q35_machine_v1_5_class_init(ObjectClass
*oc, void *data)
static TypeInfo pc_q35_machine_v1_5_type_info = {
.name = "pc-q35-1.5" TYPE_MACHINE_SUFFIX,
- .parent = TYPE_PC_MACHINE,
+ .parent = TYPE_PC_Q35_MACHINE,
.class_init = pc_q35_machine_v1_5_class_init,
};
static void pc_q35_1_4_machine_options(MachineClass *mc)
{
- pc_q35_1_6_machine_options(mc);
mc->hot_add_cpu = NULL;
}
@@ -471,12 +472,13 @@ static void pc_q35_machine_v1_4_class_init(ObjectClass
*oc, void *data)
static TypeInfo pc_q35_machine_v1_4_type_info = {
.name = "pc-q35-1.4" TYPE_MACHINE_SUFFIX,
- .parent = TYPE_PC_MACHINE,
+ .parent = TYPE_PC_Q35_MACHINE,
.class_init = pc_q35_machine_v1_4_class_init,
};
static void pc_q35_machine_init(void)
{
+ type_register_static(&pc_q35_machine_type_info);
type_register_static(&pc_q35_machine_v2_1_type_info);
type_register_static(&pc_q35_machine_v2_0_type_info);
type_register_static(&pc_q35_machine_v1_7_type_info);
--
1.9.3
- [Qemu-devel] [PATCH v4 05/33] piix: Eliminate pc_init_pci(), (continued)
- [Qemu-devel] [PATCH v4 05/33] piix: Eliminate pc_init_pci(), Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 06/33] piix: Move pc-0.14 qxl compat properties to PC_COMPAT_0_14, Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 07/33] piix: Move pc-0.13 virtio-9p-pci compat to PC_COMPAT_0_13, Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 08/33] piix: Move pc-0.1[23] rombar compat props to PC_COMPAT_0_13, Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 09/33] piix: Move pc-0.11 drive version compat props to PC_COMPAT_0_11, Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 12/33] pc: Eliminate pc_common_machine_options(), Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 11/33] pc: Register machine classes directly instead of using QEMUMachine, Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 10/33] machine: Make compat_props a linked list, Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 13/33] pc: Eliminate pc_default_machine_options(), Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 14/33] piix: Eliminate pc_i440fx_machine_options(), Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 15/33] q35: Eliminate pc_q35_machine_options(),
Eduardo Habkost <=
- [Qemu-devel] [PATCH v4 16/33] q35: Eliminate pc_q35_1_4_machine_options(), Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 17/33] pc: Eliminate all *_machine_options() functions, Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 18/33] machine: Eliminate QEMUMachine.compat_props, Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 19/33] pc: Rename pc_machine variable to pcms, Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 20/33] pc: Pass PCMachineState argument to pc_cpus_init(), Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 21/33] machine: Add MachineClass.default_cpu_model field, Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 22/33] pc: Move globals to PCMachineClass, Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 23/33] pc: Move option_rom_has_mr/rom_file_has_mr to MachineClass, Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 24/33] pc: Add PCMachineClass.compat_apic_id_mode field, Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 25/33] target-i386: Move error handling to end of x86_cpu_parse_featurestr(), Eduardo Habkost, 2014/08/14