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