[RESEND PATCH 0/2] Fix machine parameter default_bus_bypass_iommu

[RESEND PATCH 0/2] Fix machine parameter default_bus_bypass_iommu

[Jean-Philippe Brucker]

The machine option "default_bus_bypass_iommu" is broken since commit
d8fb7d0969d5 ("vl: switch -M parsing to keyval"). Fix both machines that
implement it.

Resending with Review and Tested tags, no other change since last
posting:
https://lore.kernel.org/qemu-devel/20210811085842.2511545-1-jean-philippe@linaro.org/

The fix was suggested by Paolo:
https://lore.kernel.org/qemu-devel/6e233344-dd09-598f-082a-afe73d788b33@redhat.com/

Jean-Philippe Brucker (2):
  hw/arm/virt: Rename default_bus_bypass_iommu
  hw/i386: Rename default_bus_bypass_iommu

 hw/arm/virt.c | 4 ++--
 hw/i386/pc.c  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

-- 
2.33.0

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

[Jean-Philippe Brucker]

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")
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Tested-by: Eric Auger <eric.auger@redhat.com>
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 7170aaacd5..5fdd5aa888 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -2687,10 +2687,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");
 
-- 
2.33.0

[RESEND PATCH 2/2] hw/i386: Rename default_bus_bypass_iommu

[Jean-Philippe Brucker]

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-x86_64 -M q35,default_bus_bypass_iommu=on
qemu-system-x86_64: Property 'pc-q35-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: c9e96b04fc19 ("hw/i386: Add a default_bus_bypass_iommu pc machine option")
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Tested-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
---
 hw/i386/pc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 86223acfd3..54e4c00dce 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1718,7 +1718,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
     object_class_property_add_bool(oc, "hpet",
         pc_machine_get_hpet, pc_machine_set_hpet);
 
-    object_class_property_add_bool(oc, "default_bus_bypass_iommu",
+    object_class_property_add_bool(oc, "default-bus-bypass-iommu",
         pc_machine_get_default_bus_bypass_iommu,
         pc_machine_set_default_bus_bypass_iommu);
 
-- 
2.33.0

Re: [RESEND PATCH 2/2] hw/i386: Rename default_bus_bypass_iommu

[Michael S. Tsirkin]

On Wed, Oct 13, 2021 at 05:06:08PM +0100, 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-x86_64 -M q35,default_bus_bypass_iommu=on
> qemu-system-x86_64: Property 'pc-q35-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: c9e96b04fc19 ("hw/i386: Add a default_bus_bypass_iommu pc machine option")
> Reviewed-by: Eric Auger <eric.auger@redhat.com>
> Tested-by: Eric Auger <eric.auger@redhat.com>
> Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org>

I can merge this one but I think it's independent of the
ARM patch, right? So just two independent patches.

> ---
>  hw/i386/pc.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index 86223acfd3..54e4c00dce 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -1718,7 +1718,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
>      object_class_property_add_bool(oc, "hpet",
>          pc_machine_get_hpet, pc_machine_set_hpet);
>  
> -    object_class_property_add_bool(oc, "default_bus_bypass_iommu",
> +    object_class_property_add_bool(oc, "default-bus-bypass-iommu",
>          pc_machine_get_default_bus_bypass_iommu,
>          pc_machine_set_default_bus_bypass_iommu);
>  
> -- 
> 2.33.0

Re: [RESEND PATCH 2/2] hw/i386: Rename default_bus_bypass_iommu

[Jean-Philippe Brucker]

On Fri, Oct 22, 2021 at 10:46:08AM -0400, Michael S. Tsirkin wrote:
> On Wed, Oct 13, 2021 at 05:06:08PM +0100, 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-x86_64 -M q35,default_bus_bypass_iommu=on
> > qemu-system-x86_64: Property 'pc-q35-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: c9e96b04fc19 ("hw/i386: Add a default_bus_bypass_iommu pc machine option")
> > Reviewed-by: Eric Auger <eric.auger@redhat.com>
> > Tested-by: Eric Auger <eric.auger@redhat.com>
> > Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
> 
> I can merge this one but I think it's independent of the
> ARM patch, right? So just two independent patches.

Yes they are independent

Thanks,
Jean

> 
> > ---
> >  hw/i386/pc.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> > index 86223acfd3..54e4c00dce 100644
> > --- a/hw/i386/pc.c
> > +++ b/hw/i386/pc.c
> > @@ -1718,7 +1718,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
> >      object_class_property_add_bool(oc, "hpet",
> >          pc_machine_get_hpet, pc_machine_set_hpet);
> >  
> > -    object_class_property_add_bool(oc, "default_bus_bypass_iommu",
> > +    object_class_property_add_bool(oc, "default-bus-bypass-iommu",
> >          pc_machine_get_default_bus_bypass_iommu,
> >          pc_machine_set_default_bus_bypass_iommu);
> >  
> > -- 
> > 2.33.0
> 

Re: [RESEND PATCH 2/2] hw/i386: Rename default_bus_bypass_iommu

[Michael S. Tsirkin]

On Fri, Oct 22, 2021 at 03:58:28PM +0100, Jean-Philippe Brucker wrote:
> On Fri, Oct 22, 2021 at 10:46:08AM -0400, Michael S. Tsirkin wrote:
> > On Wed, Oct 13, 2021 at 05:06:08PM +0100, 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-x86_64 -M q35,default_bus_bypass_iommu=on
> > > qemu-system-x86_64: Property 'pc-q35-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: c9e96b04fc19 ("hw/i386: Add a default_bus_bypass_iommu pc machine option")
> > > Reviewed-by: Eric Auger <eric.auger@redhat.com>
> > > Tested-by: Eric Auger <eric.auger@redhat.com>
> > > Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
> > 
> > I can merge this one but I think it's independent of the
> > ARM patch, right? So just two independent patches.
> 
> Yes they are independent
> 
> Thanks,
> Jean

Ok just post them separately pls then.

> > 
> > > ---
> > >  hw/i386/pc.c | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > 
> > > diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> > > index 86223acfd3..54e4c00dce 100644
> > > --- a/hw/i386/pc.c
> > > +++ b/hw/i386/pc.c
> > > @@ -1718,7 +1718,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
> > >      object_class_property_add_bool(oc, "hpet",
> > >          pc_machine_get_hpet, pc_machine_set_hpet);
> > >  
> > > -    object_class_property_add_bool(oc, "default_bus_bypass_iommu",
> > > +    object_class_property_add_bool(oc, "default-bus-bypass-iommu",
> > >          pc_machine_get_default_bus_bypass_iommu,
> > >          pc_machine_set_default_bus_bypass_iommu);
> > >  
> > > -- 
> > > 2.33.0
> > 

Re: [RESEND PATCH 0/2] Fix machine parameter default_bus_bypass_iommu

[Jean-Philippe Brucker]

Hi Paolo,

On Wed, Oct 13, 2021 at 05:06:06PM +0100, Jean-Philippe Brucker wrote:
> The machine option "default_bus_bypass_iommu" is broken since commit
> d8fb7d0969d5 ("vl: switch -M parsing to keyval"). Fix both machines that
> implement it.

Please could you take a look at these fixes?  Another patch adds a test
that uses default_bus_bypass_iommu [1], and is blocked by this.

Thanks,
Jean

[1] https://lore.kernel.org/qemu-devel/20211020172745.620101-11-jean-philippe@linaro.org/

> 
> Resending with Review and Tested tags, no other change since last
> posting:
> https://lore.kernel.org/qemu-devel/20210811085842.2511545-1-jean-philippe@linaro.org/
> 
> The fix was suggested by Paolo:
> https://lore.kernel.org/qemu-devel/6e233344-dd09-598f-082a-afe73d788b33@redhat.com/
> 
> Jean-Philippe Brucker (2):
>   hw/arm/virt: Rename default_bus_bypass_iommu
>   hw/i386: Rename default_bus_bypass_iommu
> 
>  hw/arm/virt.c | 4 ++--
>  hw/i386/pc.c  | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> -- 
> 2.33.0
> 

Re: [RESEND PATCH 0/2] Fix machine parameter default_bus_bypass_iommu

[Philippe Mathieu-Daudé]

On 10/13/21 18:06, Jean-Philippe Brucker wrote:
> The machine option "default_bus_bypass_iommu" is broken since commit
> d8fb7d0969d5 ("vl: switch -M parsing to keyval"). Fix both machines that
> implement it.
> 
> Resending with Review and Tested tags, no other change since last
> posting:
> https://lore.kernel.org/qemu-devel/20210811085842.2511545-1-jean-philippe@linaro.org/
> 
> The fix was suggested by Paolo:
> https://lore.kernel.org/qemu-devel/6e233344-dd09-598f-082a-afe73d788b33@redhat.com/
> 
> Jean-Philippe Brucker (2):
>   hw/arm/virt: Rename default_bus_bypass_iommu
>   hw/i386: Rename default_bus_bypass_iommu
> 
>  hw/arm/virt.c | 4 ++--
>  hw/i386/pc.c  | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>