60 lines
2.1 KiB
Diff
60 lines
2.1 KiB
Diff
|
From e3360c415f7de923d27c3167260a93cb679afabe Mon Sep 17 00:00:00 2001
|
||
|
|
From: Eric Auger <eric.auger@redhat.com>
|
||
|
|
Date: Mon, 6 May 2024 15:09:43 +0200
|
||
|
|
Subject: [PATCH 1/2] hw/arm/virt: Fix spurious call to arm_virt_compat_set()
|
||
|
|
|
||
|
|
RH-Author: Eric Auger <eric.auger@redhat.com>
|
||
|
|
RH-MergeRequest: 238: hw/arm/virt: Fix spurious call to arm_virt_compat_set()
|
||
|
|
RH-Jira: RHEL-34945
|
||
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||
|
|
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
||
|
|
RH-Acked-by: Gavin Shan <gshan@redhat.com>
|
||
|
|
RH-Commit: [1/1] a858a3e1dff12b28e14f7e4bd2b896a9f06eacbb (eauger1/centos-qemu-kvm)
|
||
|
|
|
||
|
|
JIRA: https://issues.redhat.com/browse/RHEL-34945
|
||
|
|
Status: RHEL-only
|
||
|
|
|
||
|
|
Downstream, we apply arm_rhel_compat in place of arm_virt_compat.
|
||
|
|
This is done though arm_rhel_compat_set() transparently called in
|
||
|
|
DEFINE_RHEL_MACHINE_LATEST(). So there is no need to call
|
||
|
|
arm_virt_compat_set() in rhel_machine_class_init(). Besides
|
||
|
|
this triggers a "GLib: g_ptr_array_add: assertion 'rarray' failed"
|
||
|
|
warning.
|
||
|
|
|
||
|
|
Signed-off-by: Eric Auger <eric.auger@redhat.com>
|
||
|
|
---
|
||
|
|
hw/arm/virt.c | 3 +--
|
||
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
|
||
|
|
index f1af9495c6..3f0496cdb9 100644
|
||
|
|
--- a/hw/arm/virt.c
|
||
|
|
+++ b/hw/arm/virt.c
|
||
|
|
@@ -85,6 +85,7 @@
|
||
|
|
#include "hw/char/pl011.h"
|
||
|
|
#include "qemu/guest-random.h"
|
||
|
|
|
||
|
|
+#if 0 /* Disabled for Red Hat Enterprise Linux */
|
||
|
|
static GlobalProperty arm_virt_compat[] = {
|
||
|
|
{ TYPE_VIRTIO_IOMMU_PCI, "aw-bits", "48" },
|
||
|
|
};
|
||
|
|
@@ -101,7 +102,6 @@ static void arm_virt_compat_set(MachineClass *mc)
|
||
|
|
arm_virt_compat_len);
|
||
|
|
}
|
||
|
|
|
||
|
|
-#if 0 /* Disabled for Red Hat Enterprise Linux */
|
||
|
|
#define DEFINE_VIRT_MACHINE_LATEST(major, minor, latest) \
|
||
|
|
static void virt_##major##_##minor##_class_init(ObjectClass *oc, \
|
||
|
|
void *data) \
|
||
|
|
@@ -3536,7 +3536,6 @@ static void rhel_machine_class_init(ObjectClass *oc, void *data)
|
||
|
|
{
|
||
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
||
|
|
HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(oc);
|
||
|
|
- arm_virt_compat_set(mc);
|
||
|
|
|
||
|
|
mc->family = "virt-rhel-Z";
|
||
|
|
mc->init = machvirt_init;
|
||
|
|
--
|
||
|
|
2.39.3
|
||
|
|
|