43 lines
1.5 KiB
Diff
43 lines
1.5 KiB
Diff
From c8f68b47e9390bf44c75f4ee0ebb17a6d4c3dff2 Mon Sep 17 00:00:00 2001
|
|
From: Greg Kurz <gkurz@redhat.com>
|
|
Date: Mon, 27 Sep 2021 11:14:06 +0200
|
|
Subject: [PATCH 3/4] redhat: Update pseries-rhel8.5.0
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Greg Kurz <gkurz@redhat.com>
|
|
RH-MergeRequest: 43: redhat: Add machine type compatibility update for 6.1 rebase [ppc64le]
|
|
RH-Commit: [2/2] f029c1e6a3651c0436d8ea219335eddb0da0ee35
|
|
RH-Bugzilla: 1998949
|
|
RH-Acked-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
RH-Acked-by: David Gibson (Red Hat) <dgibson@redhat.com>
|
|
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
|
Fix the default property values back to what they were before the
|
|
6.1 rebase. Now new pseries specific properties were added upstream
|
|
so we just have to wire up hw_compat_rhel_8_5.
|
|
|
|
Signed-off-by: Greg Kurz <gkurz@redhat.com>
|
|
---
|
|
hw/ppc/spapr.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
|
|
index 8f6bc88aa9..261d404c35 100644
|
|
--- a/hw/ppc/spapr.c
|
|
+++ b/hw/ppc/spapr.c
|
|
@@ -5184,6 +5184,8 @@ static void spapr_machine_rhel850_class_options(MachineClass *mc)
|
|
{
|
|
/* The default machine type must apply the RHEL specific defaults */
|
|
spapr_machine_rhel_default_class_options(mc);
|
|
+ compat_props_add(mc->compat_props, hw_compat_rhel_8_5,
|
|
+ hw_compat_rhel_8_5_len);
|
|
}
|
|
|
|
DEFINE_SPAPR_MACHINE(rhel850, "rhel8.5.0", true);
|
|
--
|
|
2.18.2
|
|
|