69 lines
2.3 KiB
Diff
69 lines
2.3 KiB
Diff
From 31530bf621dc28689142ffa83d025ec4a4f110c1 Mon Sep 17 00:00:00 2001
|
|
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
Date: Tue, 11 Jan 2022 18:29:31 +0000
|
|
Subject: [PATCH 2/2] x86: Add q35 RHEL 8.6.0 machine type
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
RH-MergeRequest: 99: x86: Add q35 RHEL 8.6.0 machine type
|
|
RH-Commit: [1/1] a694724b6fa972e312bb76b5569bc979d6c596ef
|
|
RH-Bugzilla: 2031035
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
RH-Acked-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
|
Add the new 8.6.0 machine type; note that while the -AV
|
|
notation has gone in the product naming, just keep the smbios
|
|
definitions the same for consistency.
|
|
|
|
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
---
|
|
hw/i386/pc_q35.c | 21 ++++++++++++++++++++-
|
|
1 file changed, 20 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
|
|
index f6e77bca0e..5559261d9e 100644
|
|
--- a/hw/i386/pc_q35.c
|
|
+++ b/hw/i386/pc_q35.c
|
|
@@ -646,6 +646,24 @@ static void pc_q35_machine_rhel_options(MachineClass *m)
|
|
compat_props_add(m->compat_props, pc_rhel_compat, pc_rhel_compat_len);
|
|
}
|
|
|
|
+static void pc_q35_init_rhel860(MachineState *machine)
|
|
+{
|
|
+ pc_q35_init(machine);
|
|
+}
|
|
+
|
|
+static void pc_q35_machine_rhel860_options(MachineClass *m)
|
|
+{
|
|
+ PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
|
+ pc_q35_machine_rhel_options(m);
|
|
+ m->desc = "RHEL-8.6.0 PC (Q35 + ICH9, 2009)";
|
|
+ pcmc->smbios_stream_product = "RHEL-AV";
|
|
+ pcmc->smbios_stream_version = "8.6.0";
|
|
+}
|
|
+
|
|
+DEFINE_PC_MACHINE(q35_rhel860, "pc-q35-rhel8.6.0", pc_q35_init_rhel860,
|
|
+ pc_q35_machine_rhel860_options);
|
|
+
|
|
+
|
|
static void pc_q35_init_rhel850(MachineState *machine)
|
|
{
|
|
pc_q35_init(machine);
|
|
@@ -654,8 +672,9 @@ static void pc_q35_init_rhel850(MachineState *machine)
|
|
static void pc_q35_machine_rhel850_options(MachineClass *m)
|
|
{
|
|
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
|
- pc_q35_machine_rhel_options(m);
|
|
+ pc_q35_machine_rhel860_options(m);
|
|
m->desc = "RHEL-8.5.0 PC (Q35 + ICH9, 2009)";
|
|
+ m->alias = NULL;
|
|
pcmc->smbios_stream_product = "RHEL-AV";
|
|
pcmc->smbios_stream_version = "8.5.0";
|
|
compat_props_add(m->compat_props, hw_compat_rhel_8_5,
|
|
--
|
|
2.27.0
|
|
|