|
 |
4a2fec |
From 9b07271835af176f2f10c0c50b520701e0bfc6e4 Mon Sep 17 00:00:00 2001
|
|
|
4a2fec |
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
|
4a2fec |
Date: Tue, 10 Oct 2017 10:36:01 +0200
|
|
|
4a2fec |
Subject: [PATCH 09/69] Create x86 7.5.0 machine types
|
|
|
4a2fec |
|
|
|
4a2fec |
RH-Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
4a2fec |
Message-id: <20171010103601.7723-2-dgilbert@redhat.com>
|
|
|
4a2fec |
Patchwork-id: 77054
|
|
|
4a2fec |
O-Subject: [RHV7.5 qemu-kvm-rhev PATCH 1/1] Create x86 7.5.0 machine types
|
|
|
4a2fec |
Bugzilla: 1499011
|
|
|
4a2fec |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
4a2fec |
|
|
|
4a2fec |
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
|
4a2fec |
|
|
|
4a2fec |
Not that much change from 2.9.0
|
|
|
4a2fec |
|
|
|
4a2fec |
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
4a2fec |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
4a2fec |
---
|
|
|
4a2fec |
hw/i386/pc_piix.c | 21 ++++++++++++++++++++-
|
|
|
4a2fec |
hw/i386/pc_q35.c | 19 ++++++++++++++++++-
|
|
|
4a2fec |
include/hw/i386/pc.h | 9 +++++++++
|
|
|
4a2fec |
3 files changed, 47 insertions(+), 2 deletions(-)
|
|
|
4a2fec |
|
|
|
4a2fec |
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
|
|
|
4a2fec |
index 7f12ce3..935391f 100644
|
|
|
4a2fec |
--- a/hw/i386/pc_piix.c
|
|
|
4a2fec |
+++ b/hw/i386/pc_piix.c
|
|
|
4a2fec |
@@ -1141,6 +1141,21 @@ static void pc_machine_rhel7_options(MachineClass *m)
|
|
|
4a2fec |
m->is_default = 1;
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
+static void pc_init_rhel750(MachineState *machine)
|
|
|
4a2fec |
+{
|
|
|
4a2fec |
+ pc_init1(machine, TYPE_I440FX_PCI_HOST_BRIDGE, \
|
|
|
4a2fec |
+ TYPE_I440FX_PCI_DEVICE);
|
|
|
4a2fec |
+}
|
|
|
4a2fec |
+
|
|
|
4a2fec |
+static void pc_machine_rhel750_options(MachineClass *m)
|
|
|
4a2fec |
+{
|
|
|
4a2fec |
+ pc_machine_rhel7_options(m);
|
|
|
4a2fec |
+ m->desc = "RHEL 7.5.0 PC (i440FX + PIIX, 1996)";
|
|
|
4a2fec |
+}
|
|
|
4a2fec |
+
|
|
|
4a2fec |
+DEFINE_PC_MACHINE(rhel750, "pc-i440fx-rhel7.5.0", pc_init_rhel750,
|
|
|
4a2fec |
+ pc_machine_rhel750_options);
|
|
|
4a2fec |
+
|
|
|
4a2fec |
static void pc_init_rhel740(MachineState *machine)
|
|
|
4a2fec |
{
|
|
|
4a2fec |
pc_init1(machine, TYPE_I440FX_PCI_HOST_BRIDGE, \
|
|
|
4a2fec |
@@ -1149,8 +1164,12 @@ static void pc_init_rhel740(MachineState *machine)
|
|
|
4a2fec |
|
|
|
4a2fec |
static void pc_machine_rhel740_options(MachineClass *m)
|
|
|
4a2fec |
{
|
|
|
4a2fec |
- pc_machine_rhel7_options(m);
|
|
|
4a2fec |
+ pc_machine_rhel750_options(m);
|
|
|
4a2fec |
+ m->alias = NULL;
|
|
|
4a2fec |
+ m->is_default = 0;
|
|
|
4a2fec |
m->desc = "RHEL 7.4.0 PC (i440FX + PIIX, 1996)";
|
|
|
4a2fec |
+ m->numa_auto_assign_ram = numa_legacy_auto_assign_ram;
|
|
|
4a2fec |
+ SET_MACHINE_COMPAT(m, PC_RHEL7_4_COMPAT);
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
DEFINE_PC_MACHINE(rhel740, "pc-i440fx-rhel7.4.0", pc_init_rhel740,
|
|
|
4a2fec |
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
|
|
|
4a2fec |
index 575d407..e73097b 100644
|
|
|
4a2fec |
--- a/hw/i386/pc_q35.c
|
|
|
4a2fec |
+++ b/hw/i386/pc_q35.c
|
|
|
4a2fec |
@@ -395,6 +395,20 @@ static void pc_q35_machine_rhel7_options(MachineClass *m)
|
|
|
4a2fec |
SET_MACHINE_COMPAT(m, PC_RHEL_COMPAT);
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
+static void pc_q35_init_rhel750(MachineState *machine)
|
|
|
4a2fec |
+{
|
|
|
4a2fec |
+ pc_q35_init(machine);
|
|
|
4a2fec |
+}
|
|
|
4a2fec |
+
|
|
|
4a2fec |
+static void pc_q35_machine_rhel750_options(MachineClass *m)
|
|
|
4a2fec |
+{
|
|
|
4a2fec |
+ pc_q35_machine_rhel7_options(m);
|
|
|
4a2fec |
+ m->desc = "RHEL-7.5.0 PC (Q35 + ICH9, 2009)";
|
|
|
4a2fec |
+}
|
|
|
4a2fec |
+
|
|
|
4a2fec |
+DEFINE_PC_MACHINE(q35_rhel750, "pc-q35-rhel7.5.0", pc_q35_init_rhel750,
|
|
|
4a2fec |
+ pc_q35_machine_rhel750_options);
|
|
|
4a2fec |
+
|
|
|
4a2fec |
static void pc_q35_init_rhel740(MachineState *machine)
|
|
|
4a2fec |
{
|
|
|
4a2fec |
pc_q35_init(machine);
|
|
|
4a2fec |
@@ -402,8 +416,11 @@ static void pc_q35_init_rhel740(MachineState *machine)
|
|
|
4a2fec |
|
|
|
4a2fec |
static void pc_q35_machine_rhel740_options(MachineClass *m)
|
|
|
4a2fec |
{
|
|
|
4a2fec |
- pc_q35_machine_rhel7_options(m);
|
|
|
4a2fec |
+ pc_q35_machine_rhel750_options(m);
|
|
|
4a2fec |
+ m->alias = NULL;
|
|
|
4a2fec |
m->desc = "RHEL-7.4.0 PC (Q35 + ICH9, 2009)";
|
|
|
4a2fec |
+ m->numa_auto_assign_ram = numa_legacy_auto_assign_ram;
|
|
|
4a2fec |
+ SET_MACHINE_COMPAT(m, PC_RHEL7_4_COMPAT);
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
DEFINE_PC_MACHINE(q35_rhel740, "pc-q35-rhel7.4.0", pc_q35_init_rhel740,
|
|
|
4a2fec |
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
|
|
|
4a2fec |
index b808a9b..89bdaa4 100644
|
|
|
4a2fec |
--- a/include/hw/i386/pc.h
|
|
|
4a2fec |
+++ b/include/hw/i386/pc.h
|
|
|
4a2fec |
@@ -1001,6 +1001,15 @@ extern void igd_passthrough_isa_bridge_create(PCIBus *bus, uint16_t gpu_dev_id);
|
|
|
4a2fec |
.value = "on",\
|
|
|
4a2fec |
},
|
|
|
4a2fec |
|
|
|
4a2fec |
+#define PC_RHEL7_4_COMPAT \
|
|
|
4a2fec |
+ HW_COMPAT_RHEL7_4 \
|
|
|
4a2fec |
+ { /* PC_RHEL7_4_COMPAT from PC_COMPAT_2_9 */ \
|
|
|
4a2fec |
+ .driver = "mch",\
|
|
|
4a2fec |
+ .property = "extended-tseg-mbytes",\
|
|
|
4a2fec |
+ .value = stringify(0),\
|
|
|
4a2fec |
+ },
|
|
|
4a2fec |
+
|
|
|
4a2fec |
+
|
|
|
4a2fec |
#define PC_RHEL7_3_COMPAT \
|
|
|
4a2fec |
HW_COMPAT_RHEL7_3 \
|
|
|
4a2fec |
{ /* PC_RHEL7_3_COMPAT from PC_COMPAT_2_8 */ \
|
|
|
4a2fec |
--
|
|
|
4a2fec |
1.8.3.1
|
|
|
4a2fec |
|