|
 |
ff9ada |
From 07e2094cd86c1be349c0bdda69acd1857afacb66 Mon Sep 17 00:00:00 2001
|
|
|
ff9ada |
From: Eric Auger <eric.auger@redhat.com>
|
|
|
ff9ada |
Date: Mon, 20 Dec 2021 16:04:59 +0100
|
|
|
ff9ada |
Subject: [PATCH 2/6] hw/arm/virt: Register "its" as a class property
|
|
|
ff9ada |
|
|
|
ff9ada |
RH-Author: Eric Auger <eric.auger@redhat.com>
|
|
|
ff9ada |
RH-MergeRequest: 95: hw/arm/virt: Add virt-rhel8.6.0 machine type
|
|
|
ff9ada |
RH-Commit: [2/5] 4ddfa57495578127770f93689c4d9f111a12b91c
|
|
|
ff9ada |
RH-Bugzilla: 2031039
|
|
|
ff9ada |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
ff9ada |
RH-Acked-by: Andrew Jones <drjones@redhat.com>
|
|
|
ff9ada |
RH-Acked-by: Gavin Shan <gshan@redhat.com>
|
|
|
ff9ada |
|
|
|
ff9ada |
branch: rhel-8.6.0
|
|
|
ff9ada |
Brew: 42212069
|
|
|
ff9ada |
Upstream: no
|
|
|
ff9ada |
|
|
|
ff9ada |
Register "its" as a class property. This mirrors what was done
|
|
|
ff9ada |
in commit 27edeeaafe43 ("virt: Register "its" as class property").
|
|
|
ff9ada |
|
|
|
ff9ada |
Signed-off-by: Eric Auger <eric.auger@redhat.com>
|
|
|
ff9ada |
---
|
|
|
ff9ada |
hw/arm/virt.c | 11 ++++++-----
|
|
|
ff9ada |
1 file changed, 6 insertions(+), 5 deletions(-)
|
|
|
ff9ada |
|
|
|
ff9ada |
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
|
|
|
ff9ada |
index 684ffce52e..d679391eb0 100644
|
|
|
ff9ada |
--- a/hw/arm/virt.c
|
|
|
ff9ada |
+++ b/hw/arm/virt.c
|
|
|
ff9ada |
@@ -3143,6 +3143,12 @@ static void rhel_machine_class_init(ObjectClass *oc, void *data)
|
|
|
ff9ada |
"Set on/off to enable/disable "
|
|
|
ff9ada |
"bypass_iommu for default root bus");
|
|
|
ff9ada |
|
|
|
ff9ada |
+ object_class_property_add_bool(oc, "its", virt_get_its,
|
|
|
ff9ada |
+ virt_set_its);
|
|
|
ff9ada |
+ object_class_property_set_description(oc, "its",
|
|
|
ff9ada |
+ "Set on/off to enable/disable "
|
|
|
ff9ada |
+ "ITS instantiation");
|
|
|
ff9ada |
+
|
|
|
ff9ada |
object_class_property_add_str(oc, "x-oem-id",
|
|
|
ff9ada |
virt_get_oem_id,
|
|
|
ff9ada |
virt_set_oem_id);
|
|
|
ff9ada |
@@ -3182,11 +3188,6 @@ static void rhel_virt_instance_init(Object *obj)
|
|
|
ff9ada |
} else {
|
|
|
ff9ada |
/* Default allows ITS instantiation */
|
|
|
ff9ada |
vms->its = true;
|
|
|
ff9ada |
- object_property_add_bool(obj, "its", virt_get_its,
|
|
|
ff9ada |
- virt_set_its);
|
|
|
ff9ada |
- object_property_set_description(obj, "its",
|
|
|
ff9ada |
- "Set on/off to enable/disable "
|
|
|
ff9ada |
- "ITS instantiation");
|
|
|
ff9ada |
}
|
|
|
ff9ada |
|
|
|
ff9ada |
/* Default disallows iommu instantiation */
|
|
|
ff9ada |
--
|
|
|
ff9ada |
2.27.0
|
|
|
ff9ada |
|