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