Re: [PATCH 1/2] hw/arm/virt: Rename default_bus_bypass_iommu

[Markus Armbruster]

Markus Armbruster <armbru@redhat.com> writes:

> Markus Armbruster <armbru@redhat.com> writes:
>
>> Did this series fall through the cracks for 6.1?
>
> Missed 6.1.  What now?

If I understand this correctly, it's a regression in 6.1.  Paolo, please
advise on what should be done.

>> Jean-Philippe Brucker <jean-philippe@linaro.org> writes:
>>
>>> 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@linaro.org>
>>> ---
>>>  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 b4598d3fe6..7075cdc15e 100644
>>> --- a/hw/arm/virt.c
>>> +++ b/hw/arm/virt.c
>>> @@ -2671,10 +2671,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");