From 188fa8896734043c11798495072b7f98111c5d94 Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Wed, 25 Apr 2018 13:30:35 +0000 Subject: pc: rhel7.6.0 machine-types Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1557051 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1559791 Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=15893027 The rhel7.6.0 machine-type was going to be added much later because RHEL-7.6 is not ready yet. However, adding a new machine-type is the only way to change the default NIC to e1000e. This patch adds pc-*-rhel7.6.0 machine-types. Signed-off-by: Eduardo Habkost --- hw/i386/pc_piix.c | 21 ++++++++++++++++++--- hw/i386/pc_q35.c | 18 ++++++++++++++++-- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index e5add39..0ff1e2d 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -1156,6 +1156,21 @@ static void pc_machine_rhel7_options(MachineClass *m) m->is_default = 1; } +static void pc_init_rhel760(MachineState *machine) +{ + pc_init1(machine, TYPE_I440FX_PCI_HOST_BRIDGE, \ + TYPE_I440FX_PCI_DEVICE); +} + +static void pc_machine_rhel760_options(MachineClass *m) +{ + pc_machine_rhel7_options(m); + m->desc = "RHEL 7.6.0 PC (i440FX + PIIX, 1996)"; +} + +DEFINE_PC_MACHINE(rhel760, "pc-i440fx-rhel7.6.0", pc_init_rhel760, + pc_machine_rhel760_options); + static void pc_init_rhel750(MachineState *machine) { pc_init1(machine, TYPE_I440FX_PCI_HOST_BRIDGE, \ @@ -1164,7 +1179,9 @@ static void pc_init_rhel750(MachineState *machine) static void pc_machine_rhel750_options(MachineClass *m) { - pc_machine_rhel7_options(m); + pc_machine_rhel760_options(m); + m->alias = NULL; + m->is_default = 0; m->desc = "RHEL 7.5.0 PC (i440FX + PIIX, 1996)"; m->auto_enable_numa_with_memhp = false; SET_MACHINE_COMPAT(m, PC_RHEL7_5_COMPAT); @@ -1183,8 +1200,6 @@ static void pc_machine_rhel740_options(MachineClass *m) { PCMachineClass *pcmc = PC_MACHINE_CLASS(m); pc_machine_rhel750_options(m); - m->alias = NULL; - m->is_default = 0; m->desc = "RHEL 7.4.0 PC (i440FX + PIIX, 1996)"; m->numa_auto_assign_ram = numa_legacy_auto_assign_ram; pcmc->pc_rom_ro = false; diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index ffc461d..e1fd23e 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -424,6 +424,20 @@ static void pc_q35_machine_rhel7_options(MachineClass *m) SET_MACHINE_COMPAT(m, PC_RHEL_COMPAT); } +static void pc_q35_init_rhel760(MachineState *machine) +{ + pc_q35_init(machine); +} + +static void pc_q35_machine_rhel760_options(MachineClass *m) +{ + pc_q35_machine_rhel7_options(m); + m->desc = "RHEL-7.6.0 PC (Q35 + ICH9, 2009)"; +} + +DEFINE_PC_MACHINE(q35_rhel760, "pc-q35-rhel7.6.0", pc_q35_init_rhel760, + pc_q35_machine_rhel760_options); + static void pc_q35_init_rhel750(MachineState *machine) { pc_q35_init(machine); @@ -432,7 +446,8 @@ static void pc_q35_init_rhel750(MachineState *machine) static void pc_q35_machine_rhel750_options(MachineClass *m) { PCMachineClass *pcmc = PC_MACHINE_CLASS(m); - pc_q35_machine_rhel7_options(m); + pc_q35_machine_rhel760_options(m); + m->alias = NULL; m->desc = "RHEL-7.5.0 PC (Q35 + ICH9, 2009)"; m->auto_enable_numa_with_memhp = false; pcmc->default_nic_model = "e1000"; @@ -451,7 +466,6 @@ static void pc_q35_machine_rhel740_options(MachineClass *m) { PCMachineClass *pcmc = PC_MACHINE_CLASS(m); pc_q35_machine_rhel750_options(m); - m->alias = NULL; m->desc = "RHEL-7.4.0 PC (Q35 + ICH9, 2009)"; m->numa_auto_assign_ram = numa_legacy_auto_assign_ram; pcmc->pc_rom_ro = false; -- 1.8.3.1