From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38593) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XI0fq-00019y-ME for qemu-devel@nongnu.org; Thu, 14 Aug 2014 15:27:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XI0fl-0006aO-EV for qemu-devel@nongnu.org; Thu, 14 Aug 2014 15:26:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:25111) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XI0fl-0006a9-1u for qemu-devel@nongnu.org; Thu, 14 Aug 2014 15:26:53 -0400 From: Eduardo Habkost Date: Thu, 14 Aug 2014 16:25:40 -0300 Message-Id: <1408044362-11621-12-git-send-email-ehabkost@redhat.com> In-Reply-To: <1408044362-11621-1-git-send-email-ehabkost@redhat.com> References: <1408044362-11621-1-git-send-email-ehabkost@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v4 11/33] pc: Register machine classes directly instead of using QEMUMachine List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Marcel Apfelbaum , "Michael S. Tsirkin" , Alexander Graf , Don Slutz , Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= This is a (mostly) blind and mechanical conversion of the PC QEMUMachine definitions to corresponding class registration code. Existing duplication and unnecessary complexity on macro/function reuse is being kept, to keep the conversion simple to review. The complexity and duplication will be gradually removed by the next patches. Signed-off-by: Eduardo Habkost Cc: Igor Mammedov --- Changes v1 -> v2: * Remove unused PC_DEFAULT_MACHINE_OPTIONS macro leftover * Use machine_class_register_global_props_array() * Rebase on top of Michael's pci tree * Eliminate qemu_register_pc_machine(), as it is not needed anymore Changes v2 -> v3: * Make static TypeInfo structs const Suggested-by: Andreas F=C3=A4rber --- hw/i386/pc.c | 44 ----- hw/i386/pc_piix.c | 473 +++++++++++++++++++++++++++++++++++----------= ------ hw/i386/pc_q35.c | 171 +++++++++++++------ include/hw/i386/pc.h | 17 +- 4 files changed, 448 insertions(+), 257 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 301b127..e56716f 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1532,50 +1532,6 @@ void ioapic_init_gsi(GSIState *gsi_state, const ch= ar *parent_name) } } =20 -static void pc_generic_machine_class_init(ObjectClass *oc, void *data) -{ - MachineClass *mc =3D MACHINE_CLASS(oc); - QEMUMachine *qm =3D data; - - mc->name =3D qm->name; - mc->alias =3D qm->alias; - mc->desc =3D qm->desc; - mc->init =3D qm->init; - mc->reset =3D qm->reset; - mc->hot_add_cpu =3D qm->hot_add_cpu; - mc->kvm_type =3D qm->kvm_type; - mc->block_default_type =3D qm->block_default_type; - mc->max_cpus =3D qm->max_cpus; - mc->no_serial =3D qm->no_serial; - mc->no_parallel =3D qm->no_parallel; - mc->use_virtcon =3D qm->use_virtcon; - mc->use_sclp =3D qm->use_sclp; - mc->no_floppy =3D qm->no_floppy; - mc->no_cdrom =3D qm->no_cdrom; - mc->no_sdcard =3D qm->no_sdcard; - mc->is_default =3D qm->is_default; - mc->default_machine_opts =3D qm->default_machine_opts; - mc->default_boot_order =3D qm->default_boot_order; - mc->hw_version =3D qm->hw_version; - if (qm->compat_props) { - machine_class_add_compat_props(mc, qm->compat_props); - } -} - -void qemu_register_pc_machine(QEMUMachine *m) -{ - char *name =3D g_strconcat(m->name, TYPE_MACHINE_SUFFIX, NULL); - TypeInfo ti =3D { - .name =3D name, - .parent =3D TYPE_PC_MACHINE, - .class_init =3D pc_generic_machine_class_init, - .class_data =3D (void *)m, - }; - - type_register(&ti); - g_free(name); -} - static void pc_dimm_plug(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 1127c54..a2ff925 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -452,81 +452,140 @@ static void pc_xen_hvm_init(MachineState *machine) } #endif =20 -#define PC_I440FX_MACHINE_OPTIONS \ - PC_DEFAULT_MACHINE_OPTIONS, \ - .desc =3D "Standard PC (i440FX + PIIX, 1996)", \ - .hot_add_cpu =3D pc_hot_add_cpu - -#define PC_I440FX_2_1_MACHINE_OPTIONS \ - PC_I440FX_MACHINE_OPTIONS, \ - .default_machine_opts =3D "firmware=3Dbios-256k.bin" - -static QEMUMachine pc_i440fx_machine_v2_1 =3D { - PC_I440FX_2_1_MACHINE_OPTIONS, - .name =3D "pc-i440fx-2.1", - .alias =3D "pc", - .init =3D pc_init1, - .is_default =3D 1, +static void pc_i440fx_machine_options(MachineClass *mc) +{ + pc_default_machine_options(mc); + mc->desc =3D "Standard PC (i440FX + PIIX, 1996)"; + mc->hot_add_cpu =3D pc_hot_add_cpu; +} + +static void pc_i440fx_2_1_machine_options(MachineClass *mc) +{ + pc_i440fx_machine_options(mc); + mc->default_machine_opts =3D "firmware=3Dbios-256k.bin"; +} + +static void pc_i440fx_machine_v2_1_class_init(ObjectClass *oc, void *dat= a) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + pc_i440fx_2_1_machine_options(mc); + mc->alias =3D "pc"; + mc->init =3D pc_init1; + mc->is_default =3D 1; + mc->name =3D "pc-i440fx-2.1"; +} + +static const TypeInfo pc_i440fx_machine_v2_1_type_info =3D { + .name =3D "pc-i440fx-2.1" TYPE_MACHINE_SUFFIX, + .parent =3D TYPE_PC_MACHINE, + .class_init =3D pc_i440fx_machine_v2_1_class_init, }; =20 -#define PC_I440FX_2_0_MACHINE_OPTIONS PC_I440FX_2_1_MACHINE_OPTIONS +#define pc_i440fx_2_0_machine_options pc_i440fx_2_1_machine_options =20 -static QEMUMachine pc_i440fx_machine_v2_0 =3D { - PC_I440FX_2_0_MACHINE_OPTIONS, - .name =3D "pc-i440fx-2.0", - .init =3D pc_init_pci_2_0, - .compat_props =3D (GlobalProperty[]) { +static void pc_i440fx_machine_v2_0_class_init(ObjectClass *oc, void *dat= a) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + static GlobalProperty compat_props[] =3D { PC_COMPAT_2_0, { /* end of list */ } - }, + }; + pc_i440fx_2_0_machine_options(mc); + mc->init =3D pc_init_pci_2_0; + mc->name =3D "pc-i440fx-2.0"; + machine_class_add_compat_props(mc, compat_props); +} + +static const TypeInfo pc_i440fx_machine_v2_0_type_info =3D { + .name =3D "pc-i440fx-2.0" TYPE_MACHINE_SUFFIX, + .parent =3D TYPE_PC_MACHINE, + .class_init =3D pc_i440fx_machine_v2_0_class_init, }; =20 -#define PC_I440FX_1_7_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS +#define pc_i440fx_1_7_machine_options pc_i440fx_machine_options =20 -static QEMUMachine pc_i440fx_machine_v1_7 =3D { - PC_I440FX_1_7_MACHINE_OPTIONS, - .name =3D "pc-i440fx-1.7", - .init =3D pc_init_pci_1_7, - .compat_props =3D (GlobalProperty[]) { +static void pc_i440fx_machine_v1_7_class_init(ObjectClass *oc, void *dat= a) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + static GlobalProperty compat_props[] =3D { PC_COMPAT_1_7, { /* end of list */ } - }, + }; + pc_i440fx_1_7_machine_options(mc); + mc->init =3D pc_init_pci_1_7; + mc->name =3D "pc-i440fx-1.7"; + machine_class_add_compat_props(mc, compat_props); +} + +static const TypeInfo pc_i440fx_machine_v1_7_type_info =3D { + .name =3D "pc-i440fx-1.7" TYPE_MACHINE_SUFFIX, + .parent =3D TYPE_PC_MACHINE, + .class_init =3D pc_i440fx_machine_v1_7_class_init, }; =20 -#define PC_I440FX_1_6_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS +#define pc_i440fx_1_6_machine_options pc_i440fx_machine_options =20 -static QEMUMachine pc_i440fx_machine_v1_6 =3D { - PC_I440FX_1_6_MACHINE_OPTIONS, - .name =3D "pc-i440fx-1.6", - .init =3D pc_init_pci_1_6, - .compat_props =3D (GlobalProperty[]) { +static void pc_i440fx_machine_v1_6_class_init(ObjectClass *oc, void *dat= a) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + static GlobalProperty compat_props[] =3D { PC_COMPAT_1_6, { /* end of list */ } - }, + }; + pc_i440fx_1_6_machine_options(mc); + mc->init =3D pc_init_pci_1_6; + mc->name =3D "pc-i440fx-1.6"; + machine_class_add_compat_props(mc, compat_props); +} + +static const TypeInfo pc_i440fx_machine_v1_6_type_info =3D { + .name =3D "pc-i440fx-1.6" TYPE_MACHINE_SUFFIX, + .parent =3D TYPE_PC_MACHINE, + .class_init =3D pc_i440fx_machine_v1_6_class_init, }; =20 -static QEMUMachine pc_i440fx_machine_v1_5 =3D { - PC_I440FX_1_6_MACHINE_OPTIONS, - .name =3D "pc-i440fx-1.5", - .init =3D pc_init_pci_1_5, - .compat_props =3D (GlobalProperty[]) { +static void pc_i440fx_machine_v1_5_class_init(ObjectClass *oc, void *dat= a) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + static GlobalProperty compat_props[] =3D { PC_COMPAT_1_5, { /* end of list */ } - }, + }; + pc_i440fx_1_6_machine_options(mc); + mc->init =3D pc_init_pci_1_5; + mc->name =3D "pc-i440fx-1.5"; + machine_class_add_compat_props(mc, compat_props); +} + +static const TypeInfo pc_i440fx_machine_v1_5_type_info =3D { + .name =3D "pc-i440fx-1.5" TYPE_MACHINE_SUFFIX, + .parent =3D TYPE_PC_MACHINE, + .class_init =3D pc_i440fx_machine_v1_5_class_init, }; =20 -#define PC_I440FX_1_4_MACHINE_OPTIONS \ - PC_I440FX_1_6_MACHINE_OPTIONS, \ - .hot_add_cpu =3D NULL +static void pc_i440fx_1_4_machine_options(MachineClass *mc) +{ + pc_i440fx_1_6_machine_options(mc); + mc->hot_add_cpu =3D NULL; +} =20 -static QEMUMachine pc_i440fx_machine_v1_4 =3D { - PC_I440FX_1_4_MACHINE_OPTIONS, - .name =3D "pc-i440fx-1.4", - .init =3D pc_init_pci_1_4, - .compat_props =3D (GlobalProperty[]) { +static void pc_i440fx_machine_v1_4_class_init(ObjectClass *oc, void *dat= a) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + static GlobalProperty compat_props[] =3D { PC_COMPAT_1_4, { /* end of list */ } - }, + }; + pc_i440fx_1_4_machine_options(mc); + mc->init =3D pc_init_pci_1_4; + mc->name =3D "pc-i440fx-1.4"; + machine_class_add_compat_props(mc, compat_props); +} + +static const TypeInfo pc_i440fx_machine_v1_4_type_info =3D { + .name =3D "pc-i440fx-1.4" TYPE_MACHINE_SUFFIX, + .parent =3D TYPE_PC_MACHINE, + .class_init =3D pc_i440fx_machine_v1_4_class_init, }; =20 #define PC_COMPAT_1_3 \ @@ -549,14 +608,23 @@ static QEMUMachine pc_i440fx_machine_v1_4 =3D { .value =3D "off",\ } =20 -static QEMUMachine pc_machine_v1_3 =3D { - PC_I440FX_1_4_MACHINE_OPTIONS, - .name =3D "pc-1.3", - .init =3D pc_init_pci_1_3, - .compat_props =3D (GlobalProperty[]) { +static void pc_machine_v1_3_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + static GlobalProperty compat_props[] =3D { PC_COMPAT_1_3, { /* end of list */ } - }, + }; + pc_i440fx_1_4_machine_options(mc); + mc->init =3D pc_init_pci_1_3; + mc->name =3D "pc-1.3"; + machine_class_add_compat_props(mc, compat_props); +} + +static const TypeInfo pc_machine_v1_3_type_info =3D { + .name =3D "pc-1.3" TYPE_MACHINE_SUFFIX, + .parent =3D TYPE_PC_MACHINE, + .class_init =3D pc_machine_v1_3_class_init, }; =20 #define PC_COMPAT_1_2 \ @@ -587,17 +655,28 @@ static QEMUMachine pc_machine_v1_3 =3D { .value =3D "off",\ } =20 -#define PC_I440FX_1_2_MACHINE_OPTIONS \ - PC_I440FX_1_4_MACHINE_OPTIONS, \ - .init =3D pc_init_pci_1_2 +static void pc_i440fx_1_2_machine_options(MachineClass *mc) +{ + pc_i440fx_1_4_machine_options(mc); + mc->init =3D pc_init_pci_1_2; +} =20 -static QEMUMachine pc_machine_v1_2 =3D { - PC_I440FX_1_2_MACHINE_OPTIONS, - .name =3D "pc-1.2", - .compat_props =3D (GlobalProperty[]) { +static void pc_machine_v1_2_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + static GlobalProperty compat_props[] =3D { PC_COMPAT_1_2, { /* end of list */ } - }, + }; + pc_i440fx_1_2_machine_options(mc); + mc->name =3D "pc-1.2"; + machine_class_add_compat_props(mc, compat_props); +} + +static const TypeInfo pc_machine_v1_2_type_info =3D { + .name =3D "pc-1.2" TYPE_MACHINE_SUFFIX, + .parent =3D TYPE_PC_MACHINE, + .class_init =3D pc_machine_v1_2_class_init, }; =20 #define PC_COMPAT_1_1 \ @@ -632,13 +711,22 @@ static QEMUMachine pc_machine_v1_2 =3D { .value =3D "off",\ } =20 -static QEMUMachine pc_machine_v1_1 =3D { - PC_I440FX_1_2_MACHINE_OPTIONS, - .name =3D "pc-1.1", - .compat_props =3D (GlobalProperty[]) { +static void pc_machine_v1_1_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + static GlobalProperty compat_props[] =3D { PC_COMPAT_1_1, { /* end of list */ } - }, + }; + pc_i440fx_1_2_machine_options(mc); + mc->name =3D "pc-1.1"; + machine_class_add_compat_props(mc, compat_props); +} + +static const TypeInfo pc_machine_v1_1_type_info =3D { + .name =3D "pc-1.1" TYPE_MACHINE_SUFFIX, + .parent =3D TYPE_PC_MACHINE, + .class_init =3D pc_machine_v1_1_class_init, }; =20 #define PC_COMPAT_1_0 \ @@ -661,27 +749,45 @@ static QEMUMachine pc_machine_v1_1 =3D { .value =3D "no",\ } =20 -static QEMUMachine pc_machine_v1_0 =3D { - PC_I440FX_1_2_MACHINE_OPTIONS, - .name =3D "pc-1.0", - .compat_props =3D (GlobalProperty[]) { +static void pc_machine_v1_0_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + static GlobalProperty compat_props[] =3D { PC_COMPAT_1_0, { /* end of list */ } - }, - .hw_version =3D "1.0", + }; + pc_i440fx_1_2_machine_options(mc); + mc->hw_version =3D "1.0"; + mc->name =3D "pc-1.0"; + machine_class_add_compat_props(mc, compat_props); +} + +static const TypeInfo pc_machine_v1_0_type_info =3D { + .name =3D "pc-1.0" TYPE_MACHINE_SUFFIX, + .parent =3D TYPE_PC_MACHINE, + .class_init =3D pc_machine_v1_0_class_init, }; =20 #define PC_COMPAT_0_15 \ PC_COMPAT_1_0 =20 -static QEMUMachine pc_machine_v0_15 =3D { - PC_I440FX_1_2_MACHINE_OPTIONS, - .name =3D "pc-0.15", - .compat_props =3D (GlobalProperty[]) { +static void pc_machine_v0_15_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + static GlobalProperty compat_props[] =3D { PC_COMPAT_0_15, { /* end of list */ } - }, - .hw_version =3D "0.15", + }; + pc_i440fx_1_2_machine_options(mc); + mc->hw_version =3D "0.15"; + mc->name =3D "pc-0.15"; + machine_class_add_compat_props(mc, compat_props); +} + +static const TypeInfo pc_machine_v0_15_type_info =3D { + .name =3D "pc-0.15" TYPE_MACHINE_SUFFIX, + .parent =3D TYPE_PC_MACHINE, + .class_init =3D pc_machine_v0_15_class_init, }; =20 #define PC_COMPAT_0_14 \ @@ -712,14 +818,23 @@ static QEMUMachine pc_machine_v0_15 =3D { .value =3D stringify(2),\ } =20 -static QEMUMachine pc_machine_v0_14 =3D { - PC_I440FX_1_2_MACHINE_OPTIONS, - .name =3D "pc-0.14", - .compat_props =3D (GlobalProperty[]) { +static void pc_machine_v0_14_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + static GlobalProperty compat_props[] =3D { PC_COMPAT_0_14,=20 { /* end of list */ } - }, - .hw_version =3D "0.14", + }; + pc_i440fx_1_2_machine_options(mc); + mc->hw_version =3D "0.14"; + mc->name =3D "pc-0.14"; + machine_class_add_compat_props(mc, compat_props); +} + +static const TypeInfo pc_machine_v0_14_type_info =3D { + .name =3D "pc-0.14" TYPE_MACHINE_SUFFIX, + .parent =3D TYPE_PC_MACHINE, + .class_init =3D pc_machine_v0_14_class_init, }; =20 #define PC_COMPAT_0_13 \ @@ -746,18 +861,29 @@ static QEMUMachine pc_machine_v0_14 =3D { .value =3D stringify(0),\ } =20 -#define PC_I440FX_0_13_MACHINE_OPTIONS \ - PC_I440FX_1_2_MACHINE_OPTIONS, \ - .init =3D pc_init_pci_no_kvmclock +static void pc_i440fx_0_13_machine_options(MachineClass *mc) +{ + pc_i440fx_1_2_machine_options(mc); + mc->init =3D pc_init_pci_no_kvmclock; +} =20 -static QEMUMachine pc_machine_v0_13 =3D { - PC_I440FX_0_13_MACHINE_OPTIONS, - .name =3D "pc-0.13", - .compat_props =3D (GlobalProperty[]) { +static void pc_machine_v0_13_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + static GlobalProperty compat_props[] =3D { PC_COMPAT_0_13, { /* end of list */ } - }, - .hw_version =3D "0.13", + }; + pc_i440fx_0_13_machine_options(mc); + mc->hw_version =3D "0.13"; + mc->name =3D "pc-0.13"; + machine_class_add_compat_props(mc, compat_props); +} + +static const TypeInfo pc_machine_v0_13_type_info =3D { + .name =3D "pc-0.13" TYPE_MACHINE_SUFFIX, + .parent =3D TYPE_PC_MACHINE, + .class_init =3D pc_machine_v0_13_class_init, }; =20 #define PC_COMPAT_0_12 \ @@ -784,14 +910,23 @@ static QEMUMachine pc_machine_v0_13 =3D { .value =3D "1",\ } =20 -static QEMUMachine pc_machine_v0_12 =3D { - PC_I440FX_0_13_MACHINE_OPTIONS, - .name =3D "pc-0.12", - .compat_props =3D (GlobalProperty[]) { +static void pc_machine_v0_12_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + static GlobalProperty compat_props[] =3D { PC_COMPAT_0_12, { /* end of list */ } - }, - .hw_version =3D "0.12", + }; + pc_i440fx_0_13_machine_options(mc); + mc->hw_version =3D "0.12"; + mc->name =3D "pc-0.12"; + machine_class_add_compat_props(mc, compat_props); +} + +static const TypeInfo pc_machine_v0_12_type_info =3D { + .name =3D "pc-0.12" TYPE_MACHINE_SUFFIX, + .parent =3D TYPE_PC_MACHINE, + .class_init =3D pc_machine_v0_12_class_init, }; =20 #define PC_COMPAT_0_11 \ @@ -814,20 +949,29 @@ static QEMUMachine pc_machine_v0_12 =3D { .value =3D "0.11",\ } =20 -static QEMUMachine pc_machine_v0_11 =3D { - PC_I440FX_0_13_MACHINE_OPTIONS, - .name =3D "pc-0.11", - .compat_props =3D (GlobalProperty[]) { +static void pc_machine_v0_11_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + static GlobalProperty compat_props[] =3D { PC_COMPAT_0_11, { /* end of list */ } - }, - .hw_version =3D "0.11", + }; + pc_i440fx_0_13_machine_options(mc); + mc->hw_version =3D "0.11"; + mc->name =3D "pc-0.11"; + machine_class_add_compat_props(mc, compat_props); +} + +static const TypeInfo pc_machine_v0_11_type_info =3D { + .name =3D "pc-0.11" TYPE_MACHINE_SUFFIX, + .parent =3D TYPE_PC_MACHINE, + .class_init =3D pc_machine_v0_11_class_init, }; =20 -static QEMUMachine pc_machine_v0_10 =3D { - PC_I440FX_0_13_MACHINE_OPTIONS, - .name =3D "pc-0.10", - .compat_props =3D (GlobalProperty[]) { +static void pc_machine_v0_10_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + static GlobalProperty compat_props[] =3D { PC_COMPAT_0_11, { .driver =3D "virtio-blk-pci", @@ -851,31 +995,44 @@ static QEMUMachine pc_machine_v0_10 =3D { .value =3D "0.10", }, { /* end of list */ } - }, - .hw_version =3D "0.10", + }; + pc_i440fx_0_13_machine_options(mc); + mc->hw_version =3D "0.10"; + mc->name =3D "pc-0.10"; + machine_class_add_compat_props(mc, compat_props); +} + +static const TypeInfo pc_machine_v0_10_type_info =3D { + .name =3D "pc-0.10" TYPE_MACHINE_SUFFIX, + .parent =3D TYPE_PC_MACHINE, + .class_init =3D pc_machine_v0_10_class_init, }; =20 -static QEMUMachine isapc_machine =3D { - PC_COMMON_MACHINE_OPTIONS, - .name =3D "isapc", - .desc =3D "ISA-only PC", - .init =3D pc_init_isa, - .max_cpus =3D 1, - .compat_props =3D (GlobalProperty[]) { +static void isapc_machine_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + static GlobalProperty compat_props[] =3D { { /* end of list */ } - }, + }; + pc_common_machine_options(mc); + mc->desc =3D "ISA-only PC"; + mc->init =3D pc_init_isa; + mc->max_cpus =3D 1; + mc->name =3D "isapc"; + machine_class_add_compat_props(mc, compat_props); +} + +static const TypeInfo isapc_machine_type_info =3D { + .name =3D "isapc" TYPE_MACHINE_SUFFIX, + .parent =3D TYPE_PC_MACHINE, + .class_init =3D isapc_machine_class_init, }; =20 #ifdef CONFIG_XEN -static QEMUMachine xenfv_machine =3D { - PC_COMMON_MACHINE_OPTIONS, - .name =3D "xenfv", - .desc =3D "Xen Fully-virtualized PC", - .init =3D pc_xen_hvm_init, - .max_cpus =3D HVM_MAX_VCPUS, - .default_machine_opts =3D "accel=3Dxen", - .hot_add_cpu =3D pc_hot_add_cpu, - .compat_props =3D (GlobalProperty[]) { +static void xenfv_machine_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + static GlobalProperty compat_props[] =3D { /* xenfv has no fwcfg and so does not load acpi from QEMU. * as such new acpi features don't work. */ @@ -885,31 +1042,45 @@ static QEMUMachine xenfv_machine =3D { .value =3D "off", }, { /* end of list */ } - }, + }; + pc_common_machine_options(mc); + mc->desc =3D "Xen Fully-virtualized PC"; + mc->init =3D pc_xen_hvm_init; + mc->max_cpus =3D HVM_MAX_VCPUS; + mc->default_machine_opts =3D "accel=3Dxen"; + mc->hot_add_cpu =3D pc_hot_add_cpu; + mc->name =3D "xenfv"; + machine_class_add_compat_props(mc, compat_props); +} + +static const TypeInfo xenfv_machine_type_info =3D { + .name =3D "xenfv" TYPE_MACHINE_SUFFIX, + .parent =3D TYPE_PC_MACHINE, + .class_init =3D xenfv_machine_class_init, }; #endif =20 static void pc_machine_init(void) { - qemu_register_pc_machine(&pc_i440fx_machine_v2_1); - qemu_register_pc_machine(&pc_i440fx_machine_v2_0); - qemu_register_pc_machine(&pc_i440fx_machine_v1_7); - qemu_register_pc_machine(&pc_i440fx_machine_v1_6); - qemu_register_pc_machine(&pc_i440fx_machine_v1_5); - qemu_register_pc_machine(&pc_i440fx_machine_v1_4); - qemu_register_pc_machine(&pc_machine_v1_3); - qemu_register_pc_machine(&pc_machine_v1_2); - qemu_register_pc_machine(&pc_machine_v1_1); - qemu_register_pc_machine(&pc_machine_v1_0); - qemu_register_pc_machine(&pc_machine_v0_15); - qemu_register_pc_machine(&pc_machine_v0_14); - qemu_register_pc_machine(&pc_machine_v0_13); - qemu_register_pc_machine(&pc_machine_v0_12); - qemu_register_pc_machine(&pc_machine_v0_11); - qemu_register_pc_machine(&pc_machine_v0_10); - qemu_register_pc_machine(&isapc_machine); + 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); + type_register_static(&pc_i440fx_machine_v1_6_type_info); + type_register_static(&pc_i440fx_machine_v1_5_type_info); + type_register_static(&pc_i440fx_machine_v1_4_type_info); + type_register_static(&pc_machine_v1_3_type_info); + type_register_static(&pc_machine_v1_2_type_info); + type_register_static(&pc_machine_v1_1_type_info); + type_register_static(&pc_machine_v1_0_type_info); + type_register_static(&pc_machine_v0_15_type_info); + type_register_static(&pc_machine_v0_14_type_info); + type_register_static(&pc_machine_v0_13_type_info); + type_register_static(&pc_machine_v0_12_type_info); + type_register_static(&pc_machine_v0_11_type_info); + type_register_static(&pc_machine_v0_10_type_info); + type_register_static(&isapc_machine_type_info); #ifdef CONFIG_XEN - qemu_register_pc_machine(&xenfv_machine); + type_register_static(&xenfv_machine_type_info); #endif } =20 diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 0abd56c..3b923b7 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -341,90 +341,149 @@ static void pc_q35_init_1_4(MachineState *machine) pc_q35_init(machine); } =20 -#define PC_Q35_MACHINE_OPTIONS \ - PC_DEFAULT_MACHINE_OPTIONS, \ - .desc =3D "Standard PC (Q35 + ICH9, 2009)", \ - .hot_add_cpu =3D pc_hot_add_cpu - -#define PC_Q35_2_1_MACHINE_OPTIONS \ - PC_Q35_MACHINE_OPTIONS, \ - .default_machine_opts =3D "firmware=3Dbios-256k.bin" - -static QEMUMachine pc_q35_machine_v2_1 =3D { - PC_Q35_2_1_MACHINE_OPTIONS, - .name =3D "pc-q35-2.1", - .alias =3D "q35", - .init =3D pc_q35_init, +static void pc_q35_machine_options(MachineClass *mc) +{ + pc_default_machine_options(mc); + mc->desc =3D "Standard PC (Q35 + ICH9, 2009)"; + mc->hot_add_cpu =3D pc_hot_add_cpu; +} + +static void pc_q35_2_1_machine_options(MachineClass *mc) +{ + pc_q35_machine_options(mc); + mc->default_machine_opts =3D "firmware=3Dbios-256k.bin"; +} + +static void pc_q35_machine_v2_1_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + pc_q35_2_1_machine_options(mc); + mc->alias =3D "q35"; + mc->init =3D pc_q35_init; + mc->name =3D "pc-q35-2.1"; +} + +static TypeInfo pc_q35_machine_v2_1_type_info =3D { + .name =3D "pc-q35-2.1" TYPE_MACHINE_SUFFIX, + .parent =3D TYPE_PC_MACHINE, + .class_init =3D pc_q35_machine_v2_1_class_init, }; =20 -#define PC_Q35_2_0_MACHINE_OPTIONS PC_Q35_2_1_MACHINE_OPTIONS +#define pc_q35_2_0_machine_options pc_q35_2_1_machine_options =20 -static QEMUMachine pc_q35_machine_v2_0 =3D { - PC_Q35_2_0_MACHINE_OPTIONS, - .name =3D "pc-q35-2.0", - .init =3D pc_q35_init_2_0, - .compat_props =3D (GlobalProperty[]) { +static void pc_q35_machine_v2_0_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + static GlobalProperty compat_props[] =3D { PC_COMPAT_2_0, { /* end of list */ } - }, + }; + pc_q35_2_0_machine_options(mc); + mc->init =3D pc_q35_init_2_0; + machine_class_add_compat_props(mc, compat_props); + mc->name =3D "pc-q35-2.0"; +} + +static TypeInfo pc_q35_machine_v2_0_type_info =3D { + .name =3D "pc-q35-2.0" TYPE_MACHINE_SUFFIX, + .parent =3D TYPE_PC_MACHINE, + .class_init =3D pc_q35_machine_v2_0_class_init, }; =20 -#define PC_Q35_1_7_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS +#define pc_q35_1_7_machine_options pc_q35_machine_options =20 -static QEMUMachine pc_q35_machine_v1_7 =3D { - PC_Q35_1_7_MACHINE_OPTIONS, - .name =3D "pc-q35-1.7", - .init =3D pc_q35_init_1_7, - .compat_props =3D (GlobalProperty[]) { +static void pc_q35_machine_v1_7_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + static GlobalProperty compat_props[] =3D { PC_COMPAT_1_7, { /* end of list */ } - }, + }; + pc_q35_1_7_machine_options(mc); + mc->init =3D pc_q35_init_1_7; + machine_class_add_compat_props(mc, compat_props); + mc->name =3D "pc-q35-1.7"; +} + +static TypeInfo pc_q35_machine_v1_7_type_info =3D { + .name =3D "pc-q35-1.7" TYPE_MACHINE_SUFFIX, + .parent =3D TYPE_PC_MACHINE, + .class_init =3D pc_q35_machine_v1_7_class_init, }; =20 -#define PC_Q35_1_6_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS +#define pc_q35_1_6_machine_options pc_q35_machine_options =20 -static QEMUMachine pc_q35_machine_v1_6 =3D { - PC_Q35_1_6_MACHINE_OPTIONS, - .name =3D "pc-q35-1.6", - .init =3D pc_q35_init_1_6, - .compat_props =3D (GlobalProperty[]) { +static void pc_q35_machine_v1_6_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + static GlobalProperty compat_props[] =3D { PC_COMPAT_1_6, { /* end of list */ } - }, + }; + pc_q35_1_6_machine_options(mc); + mc->init =3D pc_q35_init_1_6; + machine_class_add_compat_props(mc, compat_props); + mc->name =3D "pc-q35-1.6"; +} + +static TypeInfo pc_q35_machine_v1_6_type_info =3D { + .name =3D "pc-q35-1.6" TYPE_MACHINE_SUFFIX, + .parent =3D TYPE_PC_MACHINE, + .class_init =3D pc_q35_machine_v1_6_class_init, }; =20 -static QEMUMachine pc_q35_machine_v1_5 =3D { - PC_Q35_1_6_MACHINE_OPTIONS, - .name =3D "pc-q35-1.5", - .init =3D pc_q35_init_1_5, - .compat_props =3D (GlobalProperty[]) { +static void pc_q35_machine_v1_5_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + static GlobalProperty compat_props[] =3D { PC_COMPAT_1_5, { /* end of list */ } - }, + }; + pc_q35_1_6_machine_options(mc); + mc->init =3D pc_q35_init_1_5; + machine_class_add_compat_props(mc, compat_props); + mc->name =3D "pc-q35-1.5"; +} + +static TypeInfo pc_q35_machine_v1_5_type_info =3D { + .name =3D "pc-q35-1.5" TYPE_MACHINE_SUFFIX, + .parent =3D TYPE_PC_MACHINE, + .class_init =3D pc_q35_machine_v1_5_class_init, }; =20 -#define PC_Q35_1_4_MACHINE_OPTIONS \ - PC_Q35_1_6_MACHINE_OPTIONS, \ - .hot_add_cpu =3D NULL +static void pc_q35_1_4_machine_options(MachineClass *mc) +{ + pc_q35_1_6_machine_options(mc); + mc->hot_add_cpu =3D NULL; +} =20 -static QEMUMachine pc_q35_machine_v1_4 =3D { - PC_Q35_1_4_MACHINE_OPTIONS, - .name =3D "pc-q35-1.4", - .init =3D pc_q35_init_1_4, - .compat_props =3D (GlobalProperty[]) { +static void pc_q35_machine_v1_4_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + static GlobalProperty compat_props[] =3D { PC_COMPAT_1_4, { /* end of list */ } - }, + }; + pc_q35_1_4_machine_options(mc); + mc->init =3D pc_q35_init_1_4; + machine_class_add_compat_props(mc, compat_props); + mc->name =3D "pc-q35-1.4"; +} + +static TypeInfo pc_q35_machine_v1_4_type_info =3D { + .name =3D "pc-q35-1.4" TYPE_MACHINE_SUFFIX, + .parent =3D TYPE_PC_MACHINE, + .class_init =3D pc_q35_machine_v1_4_class_init, }; =20 static void pc_q35_machine_init(void) { - qemu_register_pc_machine(&pc_q35_machine_v2_1); - qemu_register_pc_machine(&pc_q35_machine_v2_0); - qemu_register_pc_machine(&pc_q35_machine_v1_7); - qemu_register_pc_machine(&pc_q35_machine_v1_6); - qemu_register_pc_machine(&pc_q35_machine_v1_5); - qemu_register_pc_machine(&pc_q35_machine_v1_4); + 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); + type_register_static(&pc_q35_machine_v1_6_type_info); + type_register_static(&pc_q35_machine_v1_5_type_info); + type_register_static(&pc_q35_machine_v1_4_type_info); } =20 machine_init(pc_q35_machine_init); diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 9fb7144..46bbf48 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -8,6 +8,7 @@ #include "hw/block/fdc.h" #include "net/net.h" #include "hw/i386/ioapic.h" +#include "hw/boards.h" =20 #include "qemu/range.h" #include "qemu/bitmap.h" @@ -505,12 +506,16 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint= 64_t *); .value =3D stringify(0),\ } =20 -#define PC_COMMON_MACHINE_OPTIONS \ - .default_boot_order =3D "cad" +static inline void pc_common_machine_options(MachineClass *mc) +{ + mc->default_boot_order =3D "cad"; +} =20 -#define PC_DEFAULT_MACHINE_OPTIONS \ - PC_COMMON_MACHINE_OPTIONS, \ - .hot_add_cpu =3D pc_hot_add_cpu, \ - .max_cpus =3D 255 +static inline void pc_default_machine_options(MachineClass *mc) +{ + pc_common_machine_options(mc); + mc->hot_add_cpu =3D pc_hot_add_cpu; + mc->max_cpus =3D 255; +} =20 #endif --=20 1.9.3