From: Eduardo Habkost <ehabkost@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Marcel Apfelbaum" <marcel.a@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Alexander Graf" <agraf@suse.de>,
"Don Slutz" <dslutz@verizon.com>,
"Igor Mammedov" <imammedo@redhat.com>,
"Andreas Färber" <afaerber@suse.de>
Subject: [Qemu-devel] [PATCH v4 14/33] piix: Eliminate pc_i440fx_machine_options()
Date: Thu, 14 Aug 2014 16:25:43 -0300 [thread overview]
Message-ID: <1408044362-11621-15-git-send-email-ehabkost@redhat.com> (raw)
In-Reply-To: <1408044362-11621-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 5688b10..75c05bb 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -452,15 +452,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";
}
@@ -476,7 +486,7 @@ static void pc_i440fx_machine_v2_1_class_init(ObjectClass *oc, void *data)
static const 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,
};
@@ -497,12 +507,10 @@ static void pc_i440fx_machine_v2_0_class_init(ObjectClass *oc, void *data)
static const 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);
@@ -510,7 +518,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);
@@ -518,12 +525,10 @@ static void pc_i440fx_machine_v1_7_class_init(ObjectClass *oc, void *data)
static const 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);
@@ -531,7 +536,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);
@@ -539,7 +543,7 @@ static void pc_i440fx_machine_v1_6_class_init(ObjectClass *oc, void *data)
static const 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,
};
@@ -550,7 +554,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);
@@ -558,13 +561,12 @@ static void pc_i440fx_machine_v1_5_class_init(ObjectClass *oc, void *data)
static const 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;
}
@@ -583,7 +585,7 @@ static void pc_i440fx_machine_v1_4_class_init(ObjectClass *oc, void *data)
static const 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,
};
@@ -622,7 +624,7 @@ static void pc_machine_v1_3_class_init(ObjectClass *oc, void *data)
static const 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,
};
@@ -674,7 +676,7 @@ static void pc_machine_v1_2_class_init(ObjectClass *oc, void *data)
static const 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,
};
@@ -724,7 +726,7 @@ static void pc_machine_v1_1_class_init(ObjectClass *oc, void *data)
static const 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,
};
@@ -763,7 +765,7 @@ static void pc_machine_v1_0_class_init(ObjectClass *oc, void *data)
static const 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,
};
@@ -785,7 +787,7 @@ static void pc_machine_v0_15_class_init(ObjectClass *oc, void *data)
static const 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,
};
@@ -832,7 +834,7 @@ static void pc_machine_v0_14_class_init(ObjectClass *oc, void *data)
static const 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,
};
@@ -881,7 +883,7 @@ static void pc_machine_v0_13_class_init(ObjectClass *oc, void *data)
static const 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,
};
@@ -924,7 +926,7 @@ static void pc_machine_v0_12_class_init(ObjectClass *oc, void *data)
static const 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,
};
@@ -963,7 +965,7 @@ static void pc_machine_v0_11_class_init(ObjectClass *oc, void *data)
static const 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,
};
@@ -1003,7 +1005,7 @@ static void pc_machine_v0_10_class_init(ObjectClass *oc, void *data)
static const 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,
};
@@ -1060,6 +1062,7 @@ static const 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.3
next prev parent reply other threads:[~2014-08-14 19:27 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-14 19:25 [Qemu-devel] [PATCH v4 00/33] Convert PC machine-types to QOM classes Eduardo Habkost
2014-08-14 19:25 ` [Qemu-devel] [PATCH v4 01/33] pc: Replace tabs with spaces on pc.h Eduardo Habkost
2014-08-14 19:25 ` [Qemu-devel] [PATCH v4 02/33] vl.c: Use qdev_prop_register_global() for single globals Eduardo Habkost
2014-08-14 19:25 ` [Qemu-devel] [PATCH v4 03/33] pc: Eliminate has_pci_info global variable Eduardo Habkost
2014-08-14 19:25 ` [Qemu-devel] [PATCH v4 04/33] piix: Add kvmclock_enabled, pci_enabled globals Eduardo Habkost
2014-08-14 19:25 ` [Qemu-devel] [PATCH v4 05/33] piix: Eliminate pc_init_pci() Eduardo Habkost
2014-08-14 19:25 ` [Qemu-devel] [PATCH v4 06/33] piix: Move pc-0.14 qxl compat properties to PC_COMPAT_0_14 Eduardo Habkost
2014-08-14 19:25 ` [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 19:25 ` [Qemu-devel] [PATCH v4 08/33] piix: Move pc-0.1[23] rombar compat props " Eduardo Habkost
2014-08-14 19:25 ` [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 19:25 ` [Qemu-devel] [PATCH v4 10/33] machine: Make compat_props a linked list Eduardo Habkost
2014-08-14 19:25 ` [Qemu-devel] [PATCH v4 11/33] pc: Register machine classes directly instead of using QEMUMachine Eduardo Habkost
2014-08-14 19:25 ` [Qemu-devel] [PATCH v4 12/33] pc: Eliminate pc_common_machine_options() Eduardo Habkost
2014-08-14 19:25 ` [Qemu-devel] [PATCH v4 13/33] pc: Eliminate pc_default_machine_options() Eduardo Habkost
2014-08-14 19:25 ` Eduardo Habkost [this message]
2014-08-14 19:25 ` [Qemu-devel] [PATCH v4 15/33] q35: Eliminate pc_q35_machine_options() Eduardo Habkost
2014-08-14 19:25 ` [Qemu-devel] [PATCH v4 16/33] q35: Eliminate pc_q35_1_4_machine_options() Eduardo Habkost
2014-08-14 19:25 ` [Qemu-devel] [PATCH v4 17/33] pc: Eliminate all *_machine_options() functions Eduardo Habkost
2014-08-14 19:25 ` [Qemu-devel] [PATCH v4 18/33] machine: Eliminate QEMUMachine.compat_props Eduardo Habkost
2014-08-14 19:25 ` [Qemu-devel] [PATCH v4 19/33] pc: Rename pc_machine variable to pcms Eduardo Habkost
2014-08-14 19:25 ` [Qemu-devel] [PATCH v4 20/33] pc: Pass PCMachineState argument to pc_cpus_init() Eduardo Habkost
2014-08-14 19:25 ` [Qemu-devel] [PATCH v4 21/33] machine: Add MachineClass.default_cpu_model field Eduardo Habkost
2014-08-14 19:25 ` [Qemu-devel] [PATCH v4 22/33] pc: Move globals to PCMachineClass Eduardo Habkost
2014-08-14 19:25 ` [Qemu-devel] [PATCH v4 23/33] pc: Move option_rom_has_mr/rom_file_has_mr to MachineClass Eduardo Habkost
2014-08-14 19:25 ` [Qemu-devel] [PATCH v4 24/33] pc: Add PCMachineClass.compat_apic_id_mode field Eduardo Habkost
2014-08-14 19:25 ` [Qemu-devel] [PATCH v4 25/33] target-i386: Move error handling to end of x86_cpu_parse_featurestr() Eduardo Habkost
2014-08-14 19:25 ` [Qemu-devel] [PATCH v4 26/33] target-i386: Renove underscores from feature names Eduardo Habkost
2014-08-14 19:31 ` Michael S. Tsirkin
2014-08-14 19:32 ` Eduardo Habkost
2014-08-14 19:25 ` [Qemu-devel] [PATCH v4 27/33] target-i386: Register X86CPU "feat-kvmclock" feature Eduardo Habkost
2014-08-14 21:08 ` Michael S. Tsirkin
2014-08-14 23:59 ` Eduardo Habkost
2014-08-16 21:03 ` Michael S. Tsirkin
2014-08-14 19:25 ` [Qemu-devel] [PATCH v4 28/33] target-i386: set [+-]feature using QOM properties Eduardo Habkost
2014-08-14 19:25 ` [Qemu-devel] [PATCH v4 29/33] pc: Use compat_props for CPUID compat bits Eduardo Habkost
2014-08-14 19:25 ` [Qemu-devel] [PATCH v4 30/33] target-i386: Move some declarations to hw/i386/cpu.h Eduardo Habkost
2014-08-14 19:26 ` [Qemu-devel] [PATCH v4 31/33] pc: Add default KVM features fields to PCMachineClass Eduardo Habkost
2014-08-14 21:09 ` Michael S. Tsirkin
2014-08-15 0:04 ` Eduardo Habkost
2014-08-14 19:26 ` [Qemu-devel] [PATCH v4 32/33] pc: Eliminate pc_compat_*() functions Eduardo Habkost
2014-08-14 19:26 ` [Qemu-devel] [PATCH v4 33/33] piix: Move pc_xen_hvm_init() closer to xenfv_machine_class_init() Eduardo Habkost
2014-08-14 20:03 ` Michael S. Tsirkin
2014-08-15 0:03 ` 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=1408044362-11621-15-git-send-email-ehabkost@redhat.com \
--to=ehabkost@redhat.com \
--cc=afaerber@suse.de \
--cc=agraf@suse.de \
--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).