| Message ID | 20210811085842.2511545-1-jean-philippe@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/2] hw/arm/virt: Rename default_bus_bypass_iommu | expand |
Did this series fall through the cracks for 6.1? 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");
Markus Armbruster <armbru@redhat.com> writes: > Did this series fall through the cracks for 6.1? Missed 6.1. What now? > 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");
On Wed, Aug 25, 2021 at 09:34:45AM +0200, Markus Armbruster wrote: > Markus Armbruster <armbru@redhat.com> writes: > > > Did this series fall through the cracks for 6.1? > > Missed 6.1. What now? Patches still apply onto master. Please let me know if I should change anything, or provide backports for 6.1. Thanks, Jean
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");
On 8/11/21 10:58 AM, Jean-Philippe Brucker wrote: > 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> Reviewed-by: Eric Auger <eric.auger@redhat.com> Tested-by: Eric Auger <eric.auger@redhat.com> Thanks Eric > --- > 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"); > >
Hi Paolo, Peter, On 10/2/21 7:30 AM, Markus Armbruster wrote: > 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. Can we get those 2 fixes merged? Maybe we should also add Cc: qemu-stable@nongnu.org If so is there a chance the fix gets backported to 6.1? Thanks Eric > >>> 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"); > >
Peter, this patch fixes a bug that became a regression when the fix missed 6.1. It's been stuck on the list since August. Please have a look, and if it's good, get it merged. I'll ask the i386/pc maintainers to do the same for PATCH 2. 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");
Hi Markus, On Thu, Nov 25, 2021 at 08:11:04AM +0100, Markus Armbruster wrote: > Peter, this patch fixes a bug that became a regression when the fix > missed 6.1. It's been stuck on the list since August. Please have a > look, and if it's good, get it merged. I'll ask the i386/pc maintainers > to do the same for PATCH 2. Both fixes have been merged in v6.2 (9dad363a223d and 739b38630c45) Thanks, Jean > > 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"); >
Jean-Philippe Brucker <jean-philippe@linaro.org> writes: > Hi Markus, > > On Thu, Nov 25, 2021 at 08:11:04AM +0100, Markus Armbruster wrote: >> Peter, this patch fixes a bug that became a regression when the fix >> missed 6.1. It's been stuck on the list since August. Please have a >> look, and if it's good, get it merged. I'll ask the i386/pc maintainers >> to do the same for PATCH 2. > > Both fixes have been merged in v6.2 (9dad363a223d and 739b38630c45) I'm cross-eyed this morning. Thanks!
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");
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(-) -- 2.32.0