[qemu-xen stable-4.16] hw/arm/virt: Rename default_bus_bypass_iommu

[patchbot@xxxxxxx]

commit 36cfd11a867ebcf015db24b666ec28deb05c101f
Author:     Jean-Philippe Brucker <jean-philippe@xxxxxxxxxx>
AuthorDate: Tue Oct 26 10:37:34 2021 +0100
Commit:     Michael Roth <michael.roth@xxxxxxx>
CommitDate: Tue Dec 14 13:07:27 2021 -0600

    hw/arm/virt: Rename default_bus_bypass_iommu
    
    Since commit d8fb7d0969d5 ("vl: switch -M parsing to keyval"), machine
    parameter definitions cannot use underscores, because keyval_dashify()
    transforms them to dashes and the parser doesn't find the parameter.
    
    This affects option default_bus_bypass_iommu which was introduced in the
    same release:
    
    $ qemu-system-aarch64 -M virt,default_bus_bypass_iommu=on
    qemu-system-aarch64: Property 'virt-6.1-machine.default-bus-bypass-iommu' 
not found
    
    Rename the parameter to "default-bus-bypass-iommu". Passing
    "default_bus_bypass_iommu" is still valid since the underscore are
    transformed automatically.
    
    Fixes: 6d7a85483a06 ("hw/arm/virt: Add default_bus_bypass_iommu machine 
option")
    Signed-off-by: Jean-Philippe Brucker <jean-philippe@xxxxxxxxxx>
    Tested-by: Eric Auger <eric.auger@xxxxxxxxxx>
    Reviewed-by: Eric Auger <eric.auger@xxxxxxxxxx>
    Reviewed-by: Philippe Mathieu-Daudé <philmd@xxxxxxxxxx>
    Message-Id: <20211026093733.2144161-1-jean-philippe@xxxxxxxxxx>
    Signed-off-by: Richard Henderson <richard.henderson@xxxxxxxxxx>
    (cherry picked from commit 9dad363a223df8269175d218413aa8cd265e078e)
    Signed-off-by: Michael Roth <michael.roth@xxxxxxx>
---
 hw/arm/virt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 81eda46b0b..106be60fd4 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -2677,10 +2677,10 @@ static void virt_machine_class_init(ObjectClass *oc, 
void *data)
                                           "Set the IOMMU type. "
                                           "Valid values are none and smmuv3");
 
-    object_class_property_add_bool(oc, "default_bus_bypass_iommu",
+    object_class_property_add_bool(oc, "default-bus-bypass-iommu",
                                    virt_get_default_bus_bypass_iommu,
                                    virt_set_default_bus_bypass_iommu);
-    object_class_property_set_description(oc, "default_bus_bypass_iommu",
+    object_class_property_set_description(oc, "default-bus-bypass-iommu",
                                           "Set on/off to enable/disable "
                                           "bypass_iommu for default root bus");
 
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#stable-4.16