|
 |
1bdc94 |
From 9476ec6ee439ffc60ddd1478c2ed1fb87253f319 Mon Sep 17 00:00:00 2001
|
|
|
1bdc94 |
From: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
1bdc94 |
Date: Fri, 29 Jun 2018 18:59:37 +0200
|
|
|
1bdc94 |
Subject: [PATCH 50/57] pc: Add rhel7.6.0 machine-types
|
|
|
1bdc94 |
|
|
|
1bdc94 |
RH-Author: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
1bdc94 |
Message-id: <20180629185937.24186-2-ehabkost@redhat.com>
|
|
|
1bdc94 |
Patchwork-id: 81175
|
|
|
1bdc94 |
O-Subject: [RHEL-7.6 qemu-kvm-rhev PATCH 1/1] pc: Add rhel7.6.0 machine-types
|
|
|
1bdc94 |
Bugzilla: 1557051
|
|
|
1bdc94 |
RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Add rhel7.6.0 machine-types. They will be similar to the
|
|
|
1bdc94 |
existing 7.5.0 machines, but without the PC_RHEL7_5_COMPAT bits.
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
1bdc94 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
1bdc94 |
---
|
|
|
1bdc94 |
hw/i386/pc_piix.c | 21 ++++++++++++++++++---
|
|
|
1bdc94 |
hw/i386/pc_q35.c | 18 ++++++++++++++++--
|
|
|
1bdc94 |
2 files changed, 34 insertions(+), 5 deletions(-)
|
|
|
1bdc94 |
|
|
|
1bdc94 |
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
|
|
|
1bdc94 |
index 9991650..8a355df 100644
|
|
|
1bdc94 |
--- a/hw/i386/pc_piix.c
|
|
|
1bdc94 |
+++ b/hw/i386/pc_piix.c
|
|
|
1bdc94 |
@@ -1157,6 +1157,21 @@ static void pc_machine_rhel7_options(MachineClass *m)
|
|
|
1bdc94 |
m->is_default = 1;
|
|
|
1bdc94 |
}
|
|
|
1bdc94 |
|
|
|
1bdc94 |
+static void pc_init_rhel760(MachineState *machine)
|
|
|
1bdc94 |
+{
|
|
|
1bdc94 |
+ pc_init1(machine, TYPE_I440FX_PCI_HOST_BRIDGE, \
|
|
|
1bdc94 |
+ TYPE_I440FX_PCI_DEVICE);
|
|
|
1bdc94 |
+}
|
|
|
1bdc94 |
+
|
|
|
1bdc94 |
+static void pc_machine_rhel760_options(MachineClass *m)
|
|
|
1bdc94 |
+{
|
|
|
1bdc94 |
+ pc_machine_rhel7_options(m);
|
|
|
1bdc94 |
+ m->desc = "RHEL 7.6.0 PC (i440FX + PIIX, 1996)";
|
|
|
1bdc94 |
+}
|
|
|
1bdc94 |
+
|
|
|
1bdc94 |
+DEFINE_PC_MACHINE(rhel760, "pc-i440fx-rhel7.6.0", pc_init_rhel760,
|
|
|
1bdc94 |
+ pc_machine_rhel760_options);
|
|
|
1bdc94 |
+
|
|
|
1bdc94 |
static void pc_init_rhel750(MachineState *machine)
|
|
|
1bdc94 |
{
|
|
|
1bdc94 |
pc_init1(machine, TYPE_I440FX_PCI_HOST_BRIDGE, \
|
|
|
1bdc94 |
@@ -1165,7 +1180,9 @@ static void pc_init_rhel750(MachineState *machine)
|
|
|
1bdc94 |
|
|
|
1bdc94 |
static void pc_machine_rhel750_options(MachineClass *m)
|
|
|
1bdc94 |
{
|
|
|
1bdc94 |
- pc_machine_rhel7_options(m);
|
|
|
1bdc94 |
+ pc_machine_rhel760_options(m);
|
|
|
1bdc94 |
+ m->alias = NULL;
|
|
|
1bdc94 |
+ m->is_default = 0;
|
|
|
1bdc94 |
m->desc = "RHEL 7.5.0 PC (i440FX + PIIX, 1996)";
|
|
|
1bdc94 |
m->auto_enable_numa_with_memhp = false;
|
|
|
1bdc94 |
SET_MACHINE_COMPAT(m, PC_RHEL7_5_COMPAT);
|
|
|
1bdc94 |
@@ -1184,8 +1201,6 @@ static void pc_machine_rhel740_options(MachineClass *m)
|
|
|
1bdc94 |
{
|
|
|
1bdc94 |
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
|
|
1bdc94 |
pc_machine_rhel750_options(m);
|
|
|
1bdc94 |
- m->alias = NULL;
|
|
|
1bdc94 |
- m->is_default = 0;
|
|
|
1bdc94 |
m->desc = "RHEL 7.4.0 PC (i440FX + PIIX, 1996)";
|
|
|
1bdc94 |
m->numa_auto_assign_ram = numa_legacy_auto_assign_ram;
|
|
|
1bdc94 |
pcmc->pc_rom_ro = false;
|
|
|
1bdc94 |
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
|
|
|
1bdc94 |
index a4387e0..e17807e 100644
|
|
|
1bdc94 |
--- a/hw/i386/pc_q35.c
|
|
|
1bdc94 |
+++ b/hw/i386/pc_q35.c
|
|
|
1bdc94 |
@@ -424,6 +424,20 @@ static void pc_q35_machine_rhel7_options(MachineClass *m)
|
|
|
1bdc94 |
SET_MACHINE_COMPAT(m, PC_RHEL_COMPAT);
|
|
|
1bdc94 |
}
|
|
|
1bdc94 |
|
|
|
1bdc94 |
+static void pc_q35_init_rhel760(MachineState *machine)
|
|
|
1bdc94 |
+{
|
|
|
1bdc94 |
+ pc_q35_init(machine);
|
|
|
1bdc94 |
+}
|
|
|
1bdc94 |
+
|
|
|
1bdc94 |
+static void pc_q35_machine_rhel760_options(MachineClass *m)
|
|
|
1bdc94 |
+{
|
|
|
1bdc94 |
+ pc_q35_machine_rhel7_options(m);
|
|
|
1bdc94 |
+ m->desc = "RHEL-7.6.0 PC (Q35 + ICH9, 2009)";
|
|
|
1bdc94 |
+}
|
|
|
1bdc94 |
+
|
|
|
1bdc94 |
+DEFINE_PC_MACHINE(q35_rhel760, "pc-q35-rhel7.6.0", pc_q35_init_rhel760,
|
|
|
1bdc94 |
+ pc_q35_machine_rhel760_options);
|
|
|
1bdc94 |
+
|
|
|
1bdc94 |
static void pc_q35_init_rhel750(MachineState *machine)
|
|
|
1bdc94 |
{
|
|
|
1bdc94 |
pc_q35_init(machine);
|
|
|
1bdc94 |
@@ -432,7 +446,8 @@ static void pc_q35_init_rhel750(MachineState *machine)
|
|
|
1bdc94 |
static void pc_q35_machine_rhel750_options(MachineClass *m)
|
|
|
1bdc94 |
{
|
|
|
1bdc94 |
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
|
|
1bdc94 |
- pc_q35_machine_rhel7_options(m);
|
|
|
1bdc94 |
+ pc_q35_machine_rhel760_options(m);
|
|
|
1bdc94 |
+ m->alias = NULL;
|
|
|
1bdc94 |
m->desc = "RHEL-7.5.0 PC (Q35 + ICH9, 2009)";
|
|
|
1bdc94 |
m->auto_enable_numa_with_memhp = false;
|
|
|
1bdc94 |
pcmc->default_nic_model = "e1000";
|
|
|
1bdc94 |
@@ -451,7 +466,6 @@ static void pc_q35_machine_rhel740_options(MachineClass *m)
|
|
|
1bdc94 |
{
|
|
|
1bdc94 |
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
|
|
1bdc94 |
pc_q35_machine_rhel750_options(m);
|
|
|
1bdc94 |
- m->alias = NULL;
|
|
|
1bdc94 |
m->desc = "RHEL-7.4.0 PC (Q35 + ICH9, 2009)";
|
|
|
1bdc94 |
m->numa_auto_assign_ram = numa_legacy_auto_assign_ram;
|
|
|
1bdc94 |
pcmc->pc_rom_ro = false;
|
|
|
1bdc94 |
--
|
|
|
1bdc94 |
1.8.3.1
|
|
|
1bdc94 |
|