diff options
Diffstat (limited to 'hw/i386/pc_q35.c')
| -rw-r--r-- | hw/i386/pc_q35.c | 121 |
1 files changed, 55 insertions, 66 deletions
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 4ae6718b74..d84614546c 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -321,76 +321,71 @@ static void pc_q35_4_0_machine_options(MachineClass *m) DEFINE_Q35_MACHINE(v4_0, "pc-q35-4.0", NULL, pc_q35_4_0_machine_options); -static GlobalProperty pc_compat_3_1[] = { - PC_COMPAT_3_1 -}; - static void pc_q35_3_1_machine_options(MachineClass *m) { + static GlobalProperty compat[] = { + PC_COMPAT_3_1 + }; + pc_q35_4_0_machine_options(m); m->default_kernel_irqchip_split = false; m->alias = NULL; - compat_props_add(m->compat_props, - pc_compat_3_1, G_N_ELEMENTS(pc_compat_3_1)); + compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat)); } DEFINE_Q35_MACHINE(v3_1, "pc-q35-3.1", NULL, pc_q35_3_1_machine_options); -static GlobalProperty pc_compat_3_0[] = { - PC_COMPAT_3_0 -}; - static void pc_q35_3_0_machine_options(MachineClass *m) { + static GlobalProperty compat[] = { + PC_COMPAT_3_0 + }; + pc_q35_3_1_machine_options(m); - compat_props_add(m->compat_props, - pc_compat_3_0, G_N_ELEMENTS(pc_compat_3_0)); + compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat)); } DEFINE_Q35_MACHINE(v3_0, "pc-q35-3.0", NULL, pc_q35_3_0_machine_options); -static GlobalProperty pc_compat_2_12[] = { - PC_COMPAT_2_12 -}; - static void pc_q35_2_12_machine_options(MachineClass *m) { + static GlobalProperty compat[] = { + PC_COMPAT_2_12 + }; + pc_q35_3_0_machine_options(m); - compat_props_add(m->compat_props, - pc_compat_2_12, G_N_ELEMENTS(pc_compat_2_12)); + compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat)); } DEFINE_Q35_MACHINE(v2_12, "pc-q35-2.12", NULL, pc_q35_2_12_machine_options); -static GlobalProperty pc_compat_2_11[] = { - PC_COMPAT_2_11 -}; - static void pc_q35_2_11_machine_options(MachineClass *m) { PCMachineClass *pcmc = PC_MACHINE_CLASS(m); + static GlobalProperty compat[] = { + PC_COMPAT_2_11 + }; + pc_q35_2_12_machine_options(m); pcmc->default_nic_model = "e1000"; - compat_props_add(m->compat_props, - pc_compat_2_11, G_N_ELEMENTS(pc_compat_2_11)); + compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat)); } DEFINE_Q35_MACHINE(v2_11, "pc-q35-2.11", NULL, pc_q35_2_11_machine_options); -static GlobalProperty pc_compat_2_10[] = { - PC_COMPAT_2_10 -}; - static void pc_q35_2_10_machine_options(MachineClass *m) { + static GlobalProperty compat[] = { + PC_COMPAT_2_10 + }; + pc_q35_2_11_machine_options(m); - compat_props_add(m->compat_props, - pc_compat_2_10, G_N_ELEMENTS(pc_compat_2_10)); + compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat)); m->numa_auto_assign_ram = numa_legacy_auto_assign_ram; m->auto_enable_numa_with_memhp = false; } @@ -398,95 +393,89 @@ static void pc_q35_2_10_machine_options(MachineClass *m) DEFINE_Q35_MACHINE(v2_10, "pc-q35-2.10", NULL, pc_q35_2_10_machine_options); -static GlobalProperty pc_compat_2_9[] = { - PC_COMPAT_2_9 -}; - static void pc_q35_2_9_machine_options(MachineClass *m) { + static GlobalProperty compat[] = { + PC_COMPAT_2_9 + }; + pc_q35_2_10_machine_options(m); - compat_props_add(m->compat_props, - pc_compat_2_9, G_N_ELEMENTS(pc_compat_2_9)); + compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat)); } DEFINE_Q35_MACHINE(v2_9, "pc-q35-2.9", NULL, pc_q35_2_9_machine_options); -static GlobalProperty pc_compat_2_8[] = { - PC_COMPAT_2_8 -}; - static void pc_q35_2_8_machine_options(MachineClass *m) { + static GlobalProperty compat[] = { + PC_COMPAT_2_8 + }; + pc_q35_2_9_machine_options(m); - compat_props_add(m->compat_props, - pc_compat_2_8, G_N_ELEMENTS(pc_compat_2_8)); + compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat)); } DEFINE_Q35_MACHINE(v2_8, "pc-q35-2.8", NULL, pc_q35_2_8_machine_options); -static GlobalProperty pc_compat_2_7[] = { - PC_COMPAT_2_7 -}; - static void pc_q35_2_7_machine_options(MachineClass *m) { + static GlobalProperty compat[] = { + PC_COMPAT_2_7 + }; + pc_q35_2_8_machine_options(m); m->max_cpus = 255; - compat_props_add(m->compat_props, - pc_compat_2_7, G_N_ELEMENTS(pc_compat_2_7)); + compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat)); } DEFINE_Q35_MACHINE(v2_7, "pc-q35-2.7", NULL, pc_q35_2_7_machine_options); -static GlobalProperty pc_compat_2_6[] = { - PC_COMPAT_2_6 -}; - static void pc_q35_2_6_machine_options(MachineClass *m) { PCMachineClass *pcmc = PC_MACHINE_CLASS(m); + static GlobalProperty compat[] = { + PC_COMPAT_2_6 + }; + pc_q35_2_7_machine_options(m); pcmc->legacy_cpu_hotplug = true; pcmc->linuxboot_dma_enabled = false; - compat_props_add(m->compat_props, - pc_compat_2_6, G_N_ELEMENTS(pc_compat_2_6)); + compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat)); } DEFINE_Q35_MACHINE(v2_6, "pc-q35-2.6", NULL, pc_q35_2_6_machine_options); -static GlobalProperty pc_compat_2_5[] = { - PC_COMPAT_2_5 -}; - static void pc_q35_2_5_machine_options(MachineClass *m) { PCMachineClass *pcmc = PC_MACHINE_CLASS(m); + static GlobalProperty compat[] = { + PC_COMPAT_2_5 + }; + pc_q35_2_6_machine_options(m); pcmc->save_tsc_khz = false; m->legacy_fw_cfg_order = 1; - compat_props_add(m->compat_props, - pc_compat_2_5, G_N_ELEMENTS(pc_compat_2_5)); + compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat)); } DEFINE_Q35_MACHINE(v2_5, "pc-q35-2.5", NULL, pc_q35_2_5_machine_options); -static GlobalProperty pc_compat_2_4[] = { - PC_COMPAT_2_4 -}; - static void pc_q35_2_4_machine_options(MachineClass *m) { PCMachineClass *pcmc = PC_MACHINE_CLASS(m); + static GlobalProperty compat[] = { + PC_COMPAT_2_4 + }; + pc_q35_2_5_machine_options(m); m->hw_version = "2.4.0"; pcmc->broken_reserved_end = true; - compat_props_add(m->compat_props, - pc_compat_2_4, G_N_ELEMENTS(pc_compat_2_4)); + compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat)); } DEFINE_Q35_MACHINE(v2_4, "pc-q35-2.4", NULL, |