diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2015-05-15 14:18:56 -0300 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2015-05-31 16:26:42 +0200 |
| commit | 865906f7fdadd2732441ab158787f81f6a212bfe (patch) | |
| tree | c6d74b3e79646bfffe313919db810367d06ac5b1 /hw/i386/pc_q35.c | |
| parent | 25519b062c70f2afe2d2f0c262f3838a41e8bc7c (diff) | |
| download | qemu-865906f7fdadd2732441ab158787f81f6a212bfe.zip | |
pc: Don't use QEMUMachine anymore
Now that we have a DEFINE_PC_MACHINE helper macro that just requires an
initialization function, it is trivial to convert them to register a QOM
machine class directly, instead of using QEMUMachine.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/i386/pc_q35.c')
| -rw-r--r-- | hw/i386/pc_q35.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index dcd728cc07..6a9fe58500 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -414,7 +414,7 @@ static void pc_q35_init_1_4(MachineState *machine) pc_q35_init(machine); } -static void pc_q35_machine_options(QEMUMachine *m) +static void pc_q35_machine_options(MachineClass *m) { pc_default_machine_options(m); m->family = "pc_q35"; @@ -423,7 +423,7 @@ static void pc_q35_machine_options(QEMUMachine *m) m->units_per_default_bus = 1; } -static void pc_q35_2_4_machine_options(QEMUMachine *m) +static void pc_q35_2_4_machine_options(MachineClass *m) { pc_q35_machine_options(m); m->default_machine_opts = "firmware=bios-256k.bin"; @@ -435,7 +435,7 @@ DEFINE_PC_MACHINE(v2_4, "pc-q35-2.4", pc_q35_init, pc_q35_2_4_machine_options); -static void pc_q35_2_3_machine_options(QEMUMachine *m) +static void pc_q35_2_3_machine_options(MachineClass *m) { pc_q35_2_4_machine_options(m); m->alias = NULL; @@ -446,7 +446,7 @@ DEFINE_PC_MACHINE(v2_3, "pc-q35-2.3", pc_q35_init_2_3, pc_q35_2_3_machine_options); -static void pc_q35_2_2_machine_options(QEMUMachine *m) +static void pc_q35_2_2_machine_options(MachineClass *m) { pc_q35_2_3_machine_options(m); SET_MACHINE_COMPAT(m, PC_COMPAT_2_2); @@ -456,7 +456,7 @@ DEFINE_PC_MACHINE(v2_2, "pc-q35-2.2", pc_q35_init_2_2, pc_q35_2_2_machine_options); -static void pc_q35_2_1_machine_options(QEMUMachine *m) +static void pc_q35_2_1_machine_options(MachineClass *m) { pc_q35_2_2_machine_options(m); m->default_display = NULL; @@ -467,7 +467,7 @@ DEFINE_PC_MACHINE(v2_1, "pc-q35-2.1", pc_q35_init_2_1, pc_q35_2_1_machine_options); -static void pc_q35_2_0_machine_options(QEMUMachine *m) +static void pc_q35_2_0_machine_options(MachineClass *m) { pc_q35_2_1_machine_options(m); SET_MACHINE_COMPAT(m, PC_COMPAT_2_0); @@ -477,7 +477,7 @@ DEFINE_PC_MACHINE(v2_0, "pc-q35-2.0", pc_q35_init_2_0, pc_q35_2_0_machine_options); -static void pc_q35_1_7_machine_options(QEMUMachine *m) +static void pc_q35_1_7_machine_options(MachineClass *m) { pc_q35_2_0_machine_options(m); m->default_machine_opts = NULL; @@ -488,7 +488,7 @@ DEFINE_PC_MACHINE(v1_7, "pc-q35-1.7", pc_q35_init_1_7, pc_q35_1_7_machine_options); -static void pc_q35_1_6_machine_options(QEMUMachine *m) +static void pc_q35_1_6_machine_options(MachineClass *m) { pc_q35_machine_options(m); SET_MACHINE_COMPAT(m, PC_COMPAT_1_6); @@ -498,7 +498,7 @@ DEFINE_PC_MACHINE(v1_6, "pc-q35-1.6", pc_q35_init_1_6, pc_q35_1_6_machine_options); -static void pc_q35_1_5_machine_options(QEMUMachine *m) +static void pc_q35_1_5_machine_options(MachineClass *m) { pc_q35_1_6_machine_options(m); SET_MACHINE_COMPAT(m, PC_COMPAT_1_5); @@ -508,7 +508,7 @@ DEFINE_PC_MACHINE(v1_5, "pc-q35-1.5", pc_q35_init_1_5, pc_q35_1_5_machine_options); -static void pc_q35_1_4_machine_options(QEMUMachine *m) +static void pc_q35_1_4_machine_options(MachineClass *m) { pc_q35_1_5_machine_options(m); m->hot_add_cpu = NULL; |