55 lines
2.3 KiB
Diff
55 lines
2.3 KiB
Diff
|
From 42e530c513914b83273ec8c6a29100eb3c737604 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Eric Auger <eric.auger@redhat.com>
|
||
|
|
Date: Wed, 30 Jun 2021 07:28:38 -0400
|
||
|
|
Subject: [PATCH 01/13] arm/virt: Register iommu as a class property
|
||
|
|
|
||
|
|
RH-Author: Eric Auger <eric.auger@redhat.com>
|
||
|
|
RH-MergeRequest: 19: arm/virt: Support RAS
|
||
|
|
RH-Commit: [1/3] 48428de4deb5af94891aa5552fb9f4ea6d69acef (eauger1/centos-qemu-kvm)
|
||
|
|
RH-Bugzilla: 1838608
|
||
|
|
RH-Acked-by: Gavin Shan <gshan@redhat.com>
|
||
|
|
RH-Acked-by: Andrew Jones <drjones@redhat.com>
|
||
|
|
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
|
||
|
|
|
||
|
|
As done for highmem and gic-version, let's register the iommu property
|
||
|
|
as a class property. This is closer to the upstream code. This
|
||
|
|
change was originally made by upstream commit:
|
||
|
|
b91def7b8382 ("arm/virt: Register most properties as class properties")
|
||
|
|
|
||
|
|
Signed-off-by: Eric Auger <eric.auger@redhat.com>
|
||
|
|
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||
|
|
---
|
||
|
|
hw/arm/virt.c | 9 +++++----
|
||
|
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
|
||
|
|
index e4aa794f83..bdae24a753 100644
|
||
|
|
--- a/hw/arm/virt.c
|
||
|
|
+++ b/hw/arm/virt.c
|
||
|
|
@@ -3008,6 +3008,11 @@ static void rhel_machine_class_init(ObjectClass *oc, void *data)
|
||
|
|
"Set GIC version. "
|
||
|
|
"Valid values are 2, 3, host and max");
|
||
|
|
|
||
|
|
+ object_class_property_add_str(oc, "iommu", virt_get_iommu, virt_set_iommu);
|
||
|
|
+ object_class_property_set_description(oc, "iommu",
|
||
|
|
+ "Set the IOMMU type. "
|
||
|
|
+ "Valid values are none and smmuv3");
|
||
|
|
+
|
||
|
|
object_class_property_add_str(oc, "x-oem-id",
|
||
|
|
virt_get_oem_id,
|
||
|
|
virt_set_oem_id);
|
||
|
|
@@ -3056,10 +3061,6 @@ static void rhel_virt_instance_init(Object *obj)
|
||
|
|
|
||
|
|
/* Default disallows iommu instantiation */
|
||
|
|
vms->iommu = VIRT_IOMMU_NONE;
|
||
|
|
- object_property_add_str(obj, "iommu", virt_get_iommu, virt_set_iommu);
|
||
|
|
- object_property_set_description(obj, "iommu",
|
||
|
|
- "Set the IOMMU type. "
|
||
|
|
- "Valid values are none and smmuv3");
|
||
|
|
|
||
|
|
/* Default disallows RAS instantiation and is non-configurable for RHEL */
|
||
|
|
vms->ras = false;
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|