From: Eduardo Habkost <ehabkost@redhat.com>
To: qemu-devel@nongnu.org, "Michael S. Tsirkin" <mst@redhat.com>
Cc: "Marcel Apfelbaum" <marcel.a@redhat.com>,
"Alexander Graf" <agraf@suse.de>,
"Don Slutz" <dslutz@verizon.com>,
"Anthony Liguori" <aliguori@amazon.com>,
"Igor Mammedov" <imammedo@redhat.com>,
"Andreas Färber" <afaerber@suse.de>
Subject: [Qemu-devel] [RFC v2 11/39] piix: Eliminate pc_i440fx_machine_options()
Date: Fri, 13 Jun 2014 16:43:50 -0300 [thread overview]
Message-ID: <1402688658-22333-12-git-send-email-ehabkost@redhat.com> (raw)
In-Reply-To: <1402688658-22333-1-git-send-email-ehabkost@redhat.com>
Instead of calling it on every i440fx class_init function, just register
a common parent class for all i440fx machine-types.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
hw/i386/pc_piix.c | 55 +++++++++++++++++++++++++++++--------------------------
1 file changed, 29 insertions(+), 26 deletions(-)
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index c829aa8..87108d4 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -405,15 +405,25 @@ static void pc_xen_hvm_init(MachineState *machine)
}
#endif
-static void pc_i440fx_machine_options(MachineClass *mc)
+static void pc_i440fx_machine_class_init(ObjectClass *oc, void *data)
{
+ MachineClass *mc = MACHINE_CLASS(oc);
mc->desc = "Standard PC (i440FX + PIIX, 1996)";
mc->hot_add_cpu = pc_hot_add_cpu;
}
+#define TYPE_PC_I440FX_MACHINE "pc-i440fx" TYPE_MACHINE_SUFFIX
+
+static TypeInfo pc_i440fx_machine_type_info = {
+ .name = TYPE_PC_I440FX_MACHINE,
+ .parent = TYPE_PC_MACHINE,
+ .class_init = pc_i440fx_machine_class_init,
+ .abstract = true,
+};
+
+
static void pc_i440fx_2_1_machine_options(MachineClass *mc)
{
- pc_i440fx_machine_options(mc);
mc->default_machine_opts = "firmware=bios-256k.bin";
}
@@ -429,7 +439,7 @@ static void pc_i440fx_machine_v2_1_class_init(ObjectClass *oc, void *data)
static TypeInfo pc_i440fx_machine_v2_1_type_info = {
.name = "pc-i440fx-2.1" TYPE_MACHINE_SUFFIX,
- .parent = TYPE_PC_MACHINE,
+ .parent = TYPE_PC_I440FX_MACHINE,
.class_init = pc_i440fx_machine_v2_1_class_init,
};
@@ -450,12 +460,10 @@ static void pc_i440fx_machine_v2_0_class_init(ObjectClass *oc, void *data)
static TypeInfo pc_i440fx_machine_v2_0_type_info = {
.name = "pc-i440fx-2.0" TYPE_MACHINE_SUFFIX,
- .parent = TYPE_PC_MACHINE,
+ .parent = TYPE_PC_I440FX_MACHINE,
.class_init = pc_i440fx_machine_v2_0_class_init,
};
-#define pc_i440fx_1_7_machine_options pc_i440fx_machine_options
-
static void pc_i440fx_machine_v1_7_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
@@ -463,7 +471,6 @@ static void pc_i440fx_machine_v1_7_class_init(ObjectClass *oc, void *data)
PC_COMPAT_1_7,
{ /* end of list */ }
};
- pc_i440fx_1_7_machine_options(mc);
mc->init = pc_init_pci_1_7;
mc->name = "pc-i440fx-1.7";
machine_class_add_compat_props(mc, compat_props);
@@ -471,12 +478,10 @@ static void pc_i440fx_machine_v1_7_class_init(ObjectClass *oc, void *data)
static TypeInfo pc_i440fx_machine_v1_7_type_info = {
.name = "pc-i440fx-1.7" TYPE_MACHINE_SUFFIX,
- .parent = TYPE_PC_MACHINE,
+ .parent = TYPE_PC_I440FX_MACHINE,
.class_init = pc_i440fx_machine_v1_7_class_init,
};
-#define pc_i440fx_1_6_machine_options pc_i440fx_machine_options
-
static void pc_i440fx_machine_v1_6_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
@@ -484,7 +489,6 @@ static void pc_i440fx_machine_v1_6_class_init(ObjectClass *oc, void *data)
PC_COMPAT_1_6,
{ /* end of list */ }
};
- pc_i440fx_1_6_machine_options(mc);
mc->init = pc_init_pci_1_6;
mc->name = "pc-i440fx-1.6";
machine_class_add_compat_props(mc, compat_props);
@@ -492,7 +496,7 @@ static void pc_i440fx_machine_v1_6_class_init(ObjectClass *oc, void *data)
static TypeInfo pc_i440fx_machine_v1_6_type_info = {
.name = "pc-i440fx-1.6" TYPE_MACHINE_SUFFIX,
- .parent = TYPE_PC_MACHINE,
+ .parent = TYPE_PC_I440FX_MACHINE,
.class_init = pc_i440fx_machine_v1_6_class_init,
};
@@ -503,7 +507,6 @@ static void pc_i440fx_machine_v1_5_class_init(ObjectClass *oc, void *data)
PC_COMPAT_1_5,
{ /* end of list */ }
};
- pc_i440fx_1_6_machine_options(mc);
mc->init = pc_init_pci_1_5;
mc->name = "pc-i440fx-1.5";
machine_class_add_compat_props(mc, compat_props);
@@ -511,13 +514,12 @@ static void pc_i440fx_machine_v1_5_class_init(ObjectClass *oc, void *data)
static TypeInfo pc_i440fx_machine_v1_5_type_info = {
.name = "pc-i440fx-1.5" TYPE_MACHINE_SUFFIX,
- .parent = TYPE_PC_MACHINE,
+ .parent = TYPE_PC_I440FX_MACHINE,
.class_init = pc_i440fx_machine_v1_5_class_init,
};
static void pc_i440fx_1_4_machine_options(MachineClass *mc)
{
- pc_i440fx_1_6_machine_options(mc);
mc->hot_add_cpu = NULL;
}
@@ -536,7 +538,7 @@ static void pc_i440fx_machine_v1_4_class_init(ObjectClass *oc, void *data)
static TypeInfo pc_i440fx_machine_v1_4_type_info = {
.name = "pc-i440fx-1.4" TYPE_MACHINE_SUFFIX,
- .parent = TYPE_PC_MACHINE,
+ .parent = TYPE_PC_I440FX_MACHINE,
.class_init = pc_i440fx_machine_v1_4_class_init,
};
@@ -575,7 +577,7 @@ static void pc_machine_v1_3_class_init(ObjectClass *oc, void *data)
static TypeInfo pc_machine_v1_3_type_info = {
.name = "pc-1.3" TYPE_MACHINE_SUFFIX,
- .parent = TYPE_PC_MACHINE,
+ .parent = TYPE_PC_I440FX_MACHINE,
.class_init = pc_machine_v1_3_class_init,
};
@@ -627,7 +629,7 @@ static void pc_machine_v1_2_class_init(ObjectClass *oc, void *data)
static TypeInfo pc_machine_v1_2_type_info = {
.name = "pc-1.2" TYPE_MACHINE_SUFFIX,
- .parent = TYPE_PC_MACHINE,
+ .parent = TYPE_PC_I440FX_MACHINE,
.class_init = pc_machine_v1_2_class_init,
};
@@ -677,7 +679,7 @@ static void pc_machine_v1_1_class_init(ObjectClass *oc, void *data)
static TypeInfo pc_machine_v1_1_type_info = {
.name = "pc-1.1" TYPE_MACHINE_SUFFIX,
- .parent = TYPE_PC_MACHINE,
+ .parent = TYPE_PC_I440FX_MACHINE,
.class_init = pc_machine_v1_1_class_init,
};
@@ -716,7 +718,7 @@ static void pc_machine_v1_0_class_init(ObjectClass *oc, void *data)
static TypeInfo pc_machine_v1_0_type_info = {
.name = "pc-1.0" TYPE_MACHINE_SUFFIX,
- .parent = TYPE_PC_MACHINE,
+ .parent = TYPE_PC_I440FX_MACHINE,
.class_init = pc_machine_v1_0_class_init,
};
@@ -738,7 +740,7 @@ static void pc_machine_v0_15_class_init(ObjectClass *oc, void *data)
static TypeInfo pc_machine_v0_15_type_info = {
.name = "pc-0.15" TYPE_MACHINE_SUFFIX,
- .parent = TYPE_PC_MACHINE,
+ .parent = TYPE_PC_I440FX_MACHINE,
.class_init = pc_machine_v0_15_class_init,
};
@@ -785,7 +787,7 @@ static void pc_machine_v0_14_class_init(ObjectClass *oc, void *data)
static TypeInfo pc_machine_v0_14_type_info = {
.name = "pc-0.14" TYPE_MACHINE_SUFFIX,
- .parent = TYPE_PC_MACHINE,
+ .parent = TYPE_PC_I440FX_MACHINE,
.class_init = pc_machine_v0_14_class_init,
};
@@ -834,7 +836,7 @@ static void pc_machine_v0_13_class_init(ObjectClass *oc, void *data)
static TypeInfo pc_machine_v0_13_type_info = {
.name = "pc-0.13" TYPE_MACHINE_SUFFIX,
- .parent = TYPE_PC_MACHINE,
+ .parent = TYPE_PC_I440FX_MACHINE,
.class_init = pc_machine_v0_13_class_init,
};
@@ -877,7 +879,7 @@ static void pc_machine_v0_12_class_init(ObjectClass *oc, void *data)
static TypeInfo pc_machine_v0_12_type_info = {
.name = "pc-0.12" TYPE_MACHINE_SUFFIX,
- .parent = TYPE_PC_MACHINE,
+ .parent = TYPE_PC_I440FX_MACHINE,
.class_init = pc_machine_v0_12_class_init,
};
@@ -916,7 +918,7 @@ static void pc_machine_v0_11_class_init(ObjectClass *oc, void *data)
static TypeInfo pc_machine_v0_11_type_info = {
.name = "pc-0.11" TYPE_MACHINE_SUFFIX,
- .parent = TYPE_PC_MACHINE,
+ .parent = TYPE_PC_I440FX_MACHINE,
.class_init = pc_machine_v0_11_class_init,
};
@@ -956,7 +958,7 @@ static void pc_machine_v0_10_class_init(ObjectClass *oc, void *data)
static TypeInfo pc_machine_v0_10_type_info = {
.name = "pc-0.10" TYPE_MACHINE_SUFFIX,
- .parent = TYPE_PC_MACHINE,
+ .parent = TYPE_PC_I440FX_MACHINE,
.class_init = pc_machine_v0_10_class_init,
};
@@ -1013,6 +1015,7 @@ static TypeInfo xenfv_machine_type_info = {
static void pc_machine_init(void)
{
+ type_register_static(&pc_i440fx_machine_type_info);
type_register_static(&pc_i440fx_machine_v2_1_type_info);
type_register_static(&pc_i440fx_machine_v2_0_type_info);
type_register_static(&pc_i440fx_machine_v1_7_type_info);
--
1.9.0
next prev parent reply other threads:[~2014-06-13 19:45 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-13 19:43 [Qemu-devel] [RFC v2 00/39] Convert PC machine-types to QOM classes Eduardo Habkost
2014-06-13 19:43 ` [Qemu-devel] [RFC v2 01/39] q35: Use PC_Q35_COMPAT_1_4 on pc-q35-1.4 compat_props Eduardo Habkost
2014-06-16 10:28 ` Andreas Färber
2014-06-13 19:43 ` [Qemu-devel] [RFC v2 02/39] piix: Move pc-0.14 qxl compat properties to PC_COMPAT_0_14 Eduardo Habkost
2014-06-13 19:43 ` [Qemu-devel] [RFC v2 03/39] piix: Move pc-0.13 virtio-9p-pci compat to PC_COMPAT_0_13 Eduardo Habkost
2014-06-13 19:43 ` [Qemu-devel] [RFC v2 04/39] piix: Move pc-0.1[23] rombar compat props " Eduardo Habkost
2014-06-13 19:43 ` [Qemu-devel] [RFC v2 05/39] piix: Move pc-0.11 drive version compat props TO PC_COMPAT_0_11 Eduardo Habkost
2014-06-13 19:43 ` [Qemu-devel] [RFC v2 06/39] vl.c: Use qdev_prop_register_global() for single globals Eduardo Habkost
2014-06-16 10:30 ` Andreas Färber
2014-06-13 19:43 ` [Qemu-devel] [RFC v2 07/39] machine: Make compat_props a linked list Eduardo Habkost
2014-06-13 19:43 ` [Qemu-devel] [RFC v2 08/39] pc: Register machine classes directly instead of using QEMUMachine Eduardo Habkost
2014-06-16 10:36 ` Andreas Färber
2014-06-16 12:38 ` Eduardo Habkost
2014-06-13 19:43 ` [Qemu-devel] [RFC v2 09/39] pc: Eliminate pc_common_machine_options() Eduardo Habkost
2014-06-16 11:10 ` Andreas Färber
2014-06-13 19:43 ` [Qemu-devel] [RFC v2 10/39] pc: Eliminate pc_default_machine_options() Eduardo Habkost
2014-06-13 19:43 ` Eduardo Habkost [this message]
2014-06-13 19:43 ` [Qemu-devel] [RFC v2 12/39] q35: Eliminate pc_q35_machine_options() Eduardo Habkost
2014-06-13 19:43 ` [Qemu-devel] [RFC v2 13/39] q35: Eliminate pc_q35_1_4_machine_options() Eduardo Habkost
2014-06-13 19:43 ` [Qemu-devel] [RFC v2 14/39] pc: Eliminate *machine_options macros Eduardo Habkost
2014-06-13 19:43 ` [Qemu-devel] [RFC v2 15/39] piix: Make all *machine_options() functions call the previous one Eduardo Habkost
2014-06-13 19:43 ` [Qemu-devel] [RFC v2 16/39] pc: Eliminate all *_machine_options() functions Eduardo Habkost
2014-06-13 19:43 ` [Qemu-devel] [RFC v2 17/39] pc: Move pci_enabled parameter to PCMachineClass Eduardo Habkost
2014-06-13 19:43 ` [Qemu-devel] [RFC v2 18/39] q35: Use PCMachineClass.pci_enabled field Eduardo Habkost
2014-06-13 19:43 ` [Qemu-devel] [RFC v2 19/39] pc: Move kvmclock_enabled to PCMachineClass Eduardo Habkost
2014-06-13 19:43 ` [Qemu-devel] [RFC v2 20/39] pc: Move smbios_legacy_mode " Eduardo Habkost
2014-06-13 19:44 ` [Qemu-devel] [RFC v2 21/39] pc: Move smbios_defaults " Eduardo Habkost
2014-06-13 19:44 ` [Qemu-devel] [RFC v2 22/39] pc: Move has_acpi_build " Eduardo Habkost
2014-06-13 19:44 ` [Qemu-devel] [RFC v2 23/39] pc: Move has_pci_info " Eduardo Habkost
2014-06-13 19:44 ` [Qemu-devel] [RFC v2 24/39] pc: Move gigabyte_align " Eduardo Habkost
2014-06-13 19:44 ` [Qemu-devel] [RFC v2 25/39] pc: Move has_reserved_memory " Eduardo Habkost
2014-06-13 19:44 ` [Qemu-devel] [RFC v2 26/39] pc: Move option_rom_has_mr/rom_file_has_mr to MachineClass Eduardo Habkost
2014-06-13 19:44 ` [Qemu-devel] [RFC v2 27/39] piix: Eliminate pc_init_pci() Eduardo Habkost
2014-06-13 19:44 ` [Qemu-devel] [RFC v2 28/39] piix: Introduce struct PCI440FXMachineClass Eduardo Habkost
2014-06-13 19:44 ` [Qemu-devel] [RFC v2 29/39] pc: Create common machine init function Eduardo Habkost
2014-06-13 19:44 ` [Qemu-devel] [RFC v2 30/39] pc: Eliminate empty or trivial compat functions Eduardo Habkost
2014-06-13 19:44 ` [Qemu-devel] [RFC v2 31/39] piix: Move compat/init functions closer to corresponding class_init Eduardo Habkost
2014-06-13 19:44 ` [Qemu-devel] [RFC v2 32/39] pc: Rename pc_machine variable to pcms Eduardo Habkost
2014-06-13 19:44 ` [Qemu-devel] [RFC v2 33/39] pc: Move {ram, pci, rom}_memory variables to PCMachineState Eduardo Habkost
2014-06-13 19:44 ` [Qemu-devel] [RFC v2 34/39] pc: Move duplicate Xen init code to pc_machine_init() Eduardo Habkost
2014-06-13 19:44 ` [Qemu-devel] [RFC v2 35/39] pc: Move icc_bridge variable to PCMachineState Eduardo Habkost
2014-06-13 19:44 ` [Qemu-devel] [RFC v2 36/39] pc: Move duplicate icc-bridge and CPU initalization to pc_machine_init() Eduardo Habkost
2014-06-13 19:44 ` [Qemu-devel] [RFC v2 37/39] pc: Make pc_cpus_init() static Eduardo Habkost
2014-06-13 19:44 ` [Qemu-devel] [RFC v2 38/39] pc: Make pc_cpus_init() use PCMachineState Eduardo Habkost
2014-06-13 19:44 ` [Qemu-devel] [RFC v2 39/39] machine: Eliminate QEMUMachine.compat_props Eduardo Habkost
2014-06-14 3:53 ` [Qemu-devel] [RFC v2 00/39] Convert PC machine-types to QOM classes Eduardo Habkost
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1402688658-22333-12-git-send-email-ehabkost@redhat.com \
--to=ehabkost@redhat.com \
--cc=afaerber@suse.de \
--cc=agraf@suse.de \
--cc=aliguori@amazon.com \
--cc=dslutz@verizon.com \
--cc=imammedo@redhat.com \
--cc=marcel.a@redhat.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).