|
 |
a83cc2 |
From 7f76c347f17c5fc60f3bcb99ad65e26f9da4ed9f Mon Sep 17 00:00:00 2001
|
|
|
a83cc2 |
From: Auger Eric <eric.auger@redhat.com>
|
|
|
a83cc2 |
Date: Thu, 20 May 2021 19:23:26 -0400
|
|
|
a83cc2 |
Subject: [PATCH 10/15] hw/arm/virt: Disable PL011 clock migration through
|
|
|
a83cc2 |
hw_compat_rhel_8_3
|
|
|
a83cc2 |
|
|
|
a83cc2 |
RH-Author: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
a83cc2 |
RH-MergeRequest: 5: Synchronize RHEL-AV 8.5 release 18 to RHEL 9 Beta
|
|
|
a83cc2 |
RH-Commit: [6/12] 5f52975350b2497ee82cc5c9b8ba930e3a9b8c3d (mrezanin/centos-src-qemu-kvm)
|
|
|
a83cc2 |
RH-Bugzilla: 1957194
|
|
|
a83cc2 |
RH-Acked-by: Danilo Cesar Lemes de Paula <ddepaula@redhat.com>
|
|
|
a83cc2 |
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
a83cc2 |
RH-Acked-by: Greg Kurz <gkurz@redhat.com>
|
|
|
a83cc2 |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
a83cc2 |
|
|
|
a83cc2 |
Disable PL011 clock migration for machine types before
|
|
|
a83cc2 |
virt-rhel8.4.0.
|
|
|
a83cc2 |
|
|
|
a83cc2 |
The regression was introduced by aac63e0e6ea3
|
|
|
a83cc2 |
("hw/char/pl011: add a clock input"), in 8.4,
|
|
|
a83cc2 |
causing failure of migration between qemu 8.4 towards
|
|
|
a83cc2 |
older ones.
|
|
|
a83cc2 |
|
|
|
a83cc2 |
The fix was taken in 8.5 as part of the rebase,
|
|
|
a83cc2 |
e6fa978d8343 ("hw/arm/virt: Disable pl011 clock migration
|
|
|
a83cc2 |
if needed"). But the compat needs to be applied in
|
|
|
a83cc2 |
hw_compat_rhel_8_3[].
|
|
|
a83cc2 |
|
|
|
a83cc2 |
Signed-off-by: Eric Auger <eric.auger@redhat.com>
|
|
|
a83cc2 |
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
|
a83cc2 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
a83cc2 |
---
|
|
|
a83cc2 |
hw/core/machine.c | 2 ++
|
|
|
a83cc2 |
1 file changed, 2 insertions(+)
|
|
|
a83cc2 |
|
|
|
a83cc2 |
diff --git a/hw/core/machine.c b/hw/core/machine.c
|
|
|
a83cc2 |
index c665e869de..6c534e14fa 100644
|
|
|
a83cc2 |
--- a/hw/core/machine.c
|
|
|
a83cc2 |
+++ b/hw/core/machine.c
|
|
|
a83cc2 |
@@ -69,6 +69,8 @@ GlobalProperty hw_compat_rhel_8_3[] = {
|
|
|
a83cc2 |
{ "nvme", "use-intel-id", "on"},
|
|
|
a83cc2 |
/* hw_compat_rhel_8_3 from hw_compat_5_1 */
|
|
|
a83cc2 |
{ "pvpanic", "events", "1"}, /* PVPANIC_PANICKED */
|
|
|
a83cc2 |
+ /* hw_compat_rhel_8_3 from hw_compat_5_1 */
|
|
|
a83cc2 |
+ { "pl011", "migrate-clk", "off" },
|
|
|
a83cc2 |
/* hw_compat_rhel_8_3 bz 1912846 */
|
|
|
a83cc2 |
{ "pci-xhci", "x-rh-late-msi-cap", "off" },
|
|
|
a83cc2 |
/* hw_compat_rhel_8_3 from hw_compat_5_1 */
|
|
|
a83cc2 |
--
|
|
|
a83cc2 |
2.27.0
|
|
|
a83cc2 |
|