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