28f2e1
From e896ba2bfbb613576ec3fbe5b948a326ac06193d Mon Sep 17 00:00:00 2001
28f2e1
From: Eric Auger <eric.auger@redhat.com>
28f2e1
Date: Mon, 20 Dec 2021 15:58:38 +0100
28f2e1
Subject: [PATCH 3/6] hw/arm/virt: Rename default_bus_bypass_iommu
28f2e1
28f2e1
RH-Author: Eric Auger <eric.auger@redhat.com>
28f2e1
RH-MergeRequest: 95: hw/arm/virt: Add virt-rhel8.6.0 machine type
28f2e1
RH-Commit: [3/5] 3ed0425391dab7cf14c6e66fc1b2430be1152d6c
28f2e1
RH-Bugzilla: 2031039
28f2e1
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
28f2e1
RH-Acked-by: Andrew Jones <drjones@redhat.com>
28f2e1
RH-Acked-by: Gavin Shan <gshan@redhat.com>
28f2e1
28f2e1
branch: rhel-8.6.0
28f2e1
Brew: 42212069
28f2e1
Upstream: no
28f2e1
28f2e1
Rename "default_bus_bypass_iommu" into "default-bus-bypass-iommu".
28f2e1
This mirrors what was done in upstream commit:
28f2e1
9dad363a223 ("hw/arm/virt: Rename default_bus_bypass_iommu")
28f2e1
28f2e1
Signed-off-by: Eric Auger <eric.auger@redhat.com>
28f2e1
---
28f2e1
 hw/arm/virt.c | 4 ++--
28f2e1
 1 file changed, 2 insertions(+), 2 deletions(-)
28f2e1
28f2e1
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
28f2e1
index d679391eb0..6a4173b6c3 100644
28f2e1
--- a/hw/arm/virt.c
28f2e1
+++ b/hw/arm/virt.c
28f2e1
@@ -3136,10 +3136,10 @@ static void rhel_machine_class_init(ObjectClass *oc, void *data)
28f2e1
                                           "Set the IOMMU type. "
28f2e1
                                           "Valid values are none and smmuv3");
28f2e1
 
28f2e1
-    object_class_property_add_bool(oc, "default_bus_bypass_iommu",
28f2e1
+    object_class_property_add_bool(oc, "default-bus-bypass-iommu",
28f2e1
                                    virt_get_default_bus_bypass_iommu,
28f2e1
                                    virt_set_default_bus_bypass_iommu);
28f2e1
-    object_class_property_set_description(oc, "default_bus_bypass_iommu",
28f2e1
+    object_class_property_set_description(oc, "default-bus-bypass-iommu",
28f2e1
                                           "Set on/off to enable/disable "
28f2e1
                                           "bypass_iommu for default root bus");
28f2e1
 
28f2e1
-- 
28f2e1
2.27.0
28f2e1