[PATCH] scripts/cpu-x86-uarch-abi.py: Fix parameter error of cmd

qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed

* [PATCH] scripts/cpu-x86-uarch-abi.py: Fix parameter error of cmd
@ 2023-10-18 10:00 Zhao Liu
  2023-10-18 10:18 ` Vladimir Sementsov-Ogievskiy
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Zhao Liu @ 2023-10-18 10:00 UTC (permalink / raw)
  To: John Snow, Cleber Rosa, Vladimir Sementsov-Ogievskiy, qemu-devel
  Cc: Daniel P . Berrangé, Zhenyu Wang, Zhao Liu

From: Zhao Liu <zhao1.liu@intel.com>

When run this script, there's the error:

python3 scripts/cpu-x86-uarch-abi.py /tmp/qmp
Traceback (most recent call last):
  File "/path-to-qemu/qemu/scripts/cpu-x86-uarch-abi.py", line 96, in <module>
    cpu = shell.cmd("query-cpu-model-expansion",
TypeError: QEMUMonitorProtocol.cmd() takes 2 positional arguments but 3 were given

Commit 7f521b023bc28 ("scripts/cpu-x86-uarch-abi.py: use .command()
instead of .cmd()") converts the the original .cmd() to .command()
(which was later renamed to "cmd" to replace the original one).

But the new .cmd() only accepts typing.Mapping as the parameter instead
of typing.Dict (see _qmp.execute()).

Change the paremeters of "query-cpu-model-expansion" to typing.Mapping
format to fix this error.

Fixes: 7f521b023bc28 ("scripts/cpu-x86-uarch-abi.py: use .command() instead of .cmd()")
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
 scripts/cpu-x86-uarch-abi.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/cpu-x86-uarch-abi.py b/scripts/cpu-x86-uarch-abi.py
index f6baeeff2400..052ddd751424 100644
--- a/scripts/cpu-x86-uarch-abi.py
+++ b/scripts/cpu-x86-uarch-abi.py
@@ -94,8 +94,8 @@
 
 for name in sorted(names):
     cpu = shell.cmd("query-cpu-model-expansion",
-                    { "type": "static",
-                      "model": { "name": name }})
+                    type="static",
+                    model={ "name": name })
 
     got = {}
     for (feature, present) in cpu["model"]["props"].items():
-- 
2.34.1



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH] scripts/cpu-x86-uarch-abi.py: Fix parameter error of cmd
  2023-10-18 10:00 [PATCH] scripts/cpu-x86-uarch-abi.py: Fix parameter error of cmd Zhao Liu
@ 2023-10-18 10:18 ` Vladimir Sementsov-Ogievskiy
  2023-10-18 14:15   ` Zhao Liu
  2023-11-07 14:10 ` Zhao Liu
  2023-11-07 14:15 ` Daniel P. Berrangé
  2 siblings, 1 reply; 6+ messages in thread
From: Vladimir Sementsov-Ogievskiy @ 2023-10-18 10:18 UTC (permalink / raw)
  To: Zhao Liu, John Snow, Cleber Rosa, qemu-devel
  Cc: Daniel P . Berrangé, Zhenyu Wang, Zhao Liu

On 18.10.23 13:00, Zhao Liu wrote:
> From: Zhao Liu <zhao1.liu@intel.com>
> 
> When run this script, there's the error:
> 
> python3 scripts/cpu-x86-uarch-abi.py /tmp/qmp
> Traceback (most recent call last):
>    File "/path-to-qemu/qemu/scripts/cpu-x86-uarch-abi.py", line 96, in <module>
>      cpu = shell.cmd("query-cpu-model-expansion",
> TypeError: QEMUMonitorProtocol.cmd() takes 2 positional arguments but 3 were given
> 
> Commit 7f521b023bc28 ("scripts/cpu-x86-uarch-abi.py: use .command()
> instead of .cmd()") converts the the original .cmd() to .command()
> (which was later renamed to "cmd" to replace the original one).
> 
> But the new .cmd() only accepts typing.Mapping as the parameter instead
> of typing.Dict (see _qmp.execute()).
> 
> Change the paremeters of "query-cpu-model-expansion" to typing.Mapping
> format to fix this error.
> 
> Fixes: 7f521b023bc28 ("scripts/cpu-x86-uarch-abi.py: use .command() instead of .cmd()")
> Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
> ---
>   scripts/cpu-x86-uarch-abi.py | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/scripts/cpu-x86-uarch-abi.py b/scripts/cpu-x86-uarch-abi.py
> index f6baeeff2400..052ddd751424 100644
> --- a/scripts/cpu-x86-uarch-abi.py
> +++ b/scripts/cpu-x86-uarch-abi.py
> @@ -94,8 +94,8 @@
>   
>   for name in sorted(names):
>       cpu = shell.cmd("query-cpu-model-expansion",
> -                    { "type": "static",
> -                      "model": { "name": name }})
> +                    type="static",
> +                    model={ "name": name })
>   
>       got = {}
>       for (feature, present) in cpu["model"]["props"].items():


Oh, right, thanks for fixing:
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>

-- 
Best regards,
Vladimir



^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] scripts/cpu-x86-uarch-abi.py: Fix parameter error of cmd
  2023-10-18 10:18 ` Vladimir Sementsov-Ogievskiy
@ 2023-10-18 14:15   ` Zhao Liu
  0 siblings, 0 replies; 6+ messages in thread
From: Zhao Liu @ 2023-10-18 14:15 UTC (permalink / raw)
  To: Vladimir Sementsov-Ogievskiy
  Cc: Zhao Liu, John Snow, Cleber Rosa, qemu-devel,
	Daniel P . Berrangé, Zhenyu Wang

On Wed, Oct 18, 2023 at 01:18:51PM +0300, Vladimir Sementsov-Ogievskiy wrote:
> Date: Wed, 18 Oct 2023 13:18:51 +0300
> From: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
> Subject: Re: [PATCH] scripts/cpu-x86-uarch-abi.py: Fix parameter error of
>  cmd
> 
> On 18.10.23 13:00, Zhao Liu wrote:
> > From: Zhao Liu <zhao1.liu@intel.com>
> > 
> > When run this script, there's the error:
> > 
> > python3 scripts/cpu-x86-uarch-abi.py /tmp/qmp
> > Traceback (most recent call last):
> >    File "/path-to-qemu/qemu/scripts/cpu-x86-uarch-abi.py", line 96, in <module>
> >      cpu = shell.cmd("query-cpu-model-expansion",
> > TypeError: QEMUMonitorProtocol.cmd() takes 2 positional arguments but 3 were given
> > 
> > Commit 7f521b023bc28 ("scripts/cpu-x86-uarch-abi.py: use .command()
> > instead of .cmd()") converts the the original .cmd() to .command()
> > (which was later renamed to "cmd" to replace the original one).
> > 
> > But the new .cmd() only accepts typing.Mapping as the parameter instead
> > of typing.Dict (see _qmp.execute()).
> > 
> > Change the paremeters of "query-cpu-model-expansion" to typing.Mapping
> > format to fix this error.
> > 
> > Fixes: 7f521b023bc28 ("scripts/cpu-x86-uarch-abi.py: use .command() instead of .cmd()")
> > Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
> > ---
> >   scripts/cpu-x86-uarch-abi.py | 4 ++--
> >   1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/scripts/cpu-x86-uarch-abi.py b/scripts/cpu-x86-uarch-abi.py
> > index f6baeeff2400..052ddd751424 100644
> > --- a/scripts/cpu-x86-uarch-abi.py
> > +++ b/scripts/cpu-x86-uarch-abi.py
> > @@ -94,8 +94,8 @@
> >   for name in sorted(names):
> >       cpu = shell.cmd("query-cpu-model-expansion",
> > -                    { "type": "static",
> > -                      "model": { "name": name }})
> > +                    type="static",
> > +                    model={ "name": name })
> >       got = {}
> >       for (feature, present) in cpu["model"]["props"].items():
> 
> 
> Oh, right, thanks for fixing:
> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>

Thanks Vladimir!

-Zhao


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] scripts/cpu-x86-uarch-abi.py: Fix parameter error of cmd
  2023-10-18 10:00 [PATCH] scripts/cpu-x86-uarch-abi.py: Fix parameter error of cmd Zhao Liu
  2023-10-18 10:18 ` Vladimir Sementsov-Ogievskiy
@ 2023-11-07 14:10 ` Zhao Liu
  2023-11-07 14:15 ` Daniel P. Berrangé
  2 siblings, 0 replies; 6+ messages in thread
From: Zhao Liu @ 2023-11-07 14:10 UTC (permalink / raw)
  To: John Snow, Cleber Rosa, Vladimir Sementsov-Ogievskiy, qemu-devel
  Cc: Daniel P . Berrangé, Zhenyu Wang, Zhao Liu

Hi John and Cleber,

Just a ping. :)

Regards,
Zhao

On Wed, Oct 18, 2023 at 06:00:11PM +0800, Zhao Liu wrote:
> Date: Wed, 18 Oct 2023 18:00:11 +0800
> From: Zhao Liu <zhao1.liu@linux.intel.com>
> Subject: [PATCH] scripts/cpu-x86-uarch-abi.py: Fix parameter error of cmd
> X-Mailer: git-send-email 2.34.1
> 
> From: Zhao Liu <zhao1.liu@intel.com>
> 
> When run this script, there's the error:
> 
> python3 scripts/cpu-x86-uarch-abi.py /tmp/qmp
> Traceback (most recent call last):
>   File "/path-to-qemu/qemu/scripts/cpu-x86-uarch-abi.py", line 96, in <module>
>     cpu = shell.cmd("query-cpu-model-expansion",
> TypeError: QEMUMonitorProtocol.cmd() takes 2 positional arguments but 3 were given
> 
> Commit 7f521b023bc28 ("scripts/cpu-x86-uarch-abi.py: use .command()
> instead of .cmd()") converts the the original .cmd() to .command()
> (which was later renamed to "cmd" to replace the original one).
> 
> But the new .cmd() only accepts typing.Mapping as the parameter instead
> of typing.Dict (see _qmp.execute()).
> 
> Change the paremeters of "query-cpu-model-expansion" to typing.Mapping
> format to fix this error.
> 
> Fixes: 7f521b023bc28 ("scripts/cpu-x86-uarch-abi.py: use .command() instead of .cmd()")
> Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
> ---
>  scripts/cpu-x86-uarch-abi.py | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/scripts/cpu-x86-uarch-abi.py b/scripts/cpu-x86-uarch-abi.py
> index f6baeeff2400..052ddd751424 100644
> --- a/scripts/cpu-x86-uarch-abi.py
> +++ b/scripts/cpu-x86-uarch-abi.py
> @@ -94,8 +94,8 @@
>  
>  for name in sorted(names):
>      cpu = shell.cmd("query-cpu-model-expansion",
> -                    { "type": "static",
> -                      "model": { "name": name }})
> +                    type="static",
> +                    model={ "name": name })
>  
>      got = {}
>      for (feature, present) in cpu["model"]["props"].items():
> -- 
> 2.34.1
> 


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] scripts/cpu-x86-uarch-abi.py: Fix parameter error of cmd
  2023-10-18 10:00 [PATCH] scripts/cpu-x86-uarch-abi.py: Fix parameter error of cmd Zhao Liu
  2023-10-18 10:18 ` Vladimir Sementsov-Ogievskiy
  2023-11-07 14:10 ` Zhao Liu
@ 2023-11-07 14:15 ` Daniel P. Berrangé
  2023-11-07 15:01   ` Zhao Liu
  2 siblings, 1 reply; 6+ messages in thread
From: Daniel P. Berrangé @ 2023-11-07 14:15 UTC (permalink / raw)
  To: Zhao Liu
  Cc: John Snow, Cleber Rosa, Vladimir Sementsov-Ogievskiy, qemu-devel,
	Zhenyu Wang, Zhao Liu

On Wed, Oct 18, 2023 at 06:00:11PM +0800, Zhao Liu wrote:
> From: Zhao Liu <zhao1.liu@intel.com>
> 
> When run this script, there's the error:
> 
> python3 scripts/cpu-x86-uarch-abi.py /tmp/qmp
> Traceback (most recent call last):
>   File "/path-to-qemu/qemu/scripts/cpu-x86-uarch-abi.py", line 96, in <module>
>     cpu = shell.cmd("query-cpu-model-expansion",
> TypeError: QEMUMonitorProtocol.cmd() takes 2 positional arguments but 3 were given
> 
> Commit 7f521b023bc28 ("scripts/cpu-x86-uarch-abi.py: use .command()
> instead of .cmd()") converts the the original .cmd() to .command()
> (which was later renamed to "cmd" to replace the original one).
> 
> But the new .cmd() only accepts typing.Mapping as the parameter instead
> of typing.Dict (see _qmp.execute()).
> 
> Change the paremeters of "query-cpu-model-expansion" to typing.Mapping
> format to fix this error.
> 
> Fixes: 7f521b023bc28 ("scripts/cpu-x86-uarch-abi.py: use .command() instead of .cmd()")
> Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
> ---
>  scripts/cpu-x86-uarch-abi.py | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

I'll queue this one and sent a PULL before the final release.


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|



^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] scripts/cpu-x86-uarch-abi.py: Fix parameter error of cmd
  2023-11-07 14:15 ` Daniel P. Berrangé
@ 2023-11-07 15:01   ` Zhao Liu
  0 siblings, 0 replies; 6+ messages in thread
From: Zhao Liu @ 2023-11-07 15:01 UTC (permalink / raw)
  To: Daniel P. Berrangé
  Cc: John Snow, Cleber Rosa, Vladimir Sementsov-Ogievskiy, qemu-devel,
	Zhenyu Wang, Zhao Liu

On Tue, Nov 07, 2023 at 02:15:34PM +0000, Daniel P. Berrangé wrote:
> Date: Tue, 7 Nov 2023 14:15:34 +0000
> From: "Daniel P. Berrangé" <berrange@redhat.com>
> Subject: Re: [PATCH] scripts/cpu-x86-uarch-abi.py: Fix parameter error of
>  cmd
> 
> On Wed, Oct 18, 2023 at 06:00:11PM +0800, Zhao Liu wrote:
> > From: Zhao Liu <zhao1.liu@intel.com>
> > 
> > When run this script, there's the error:
> > 
> > python3 scripts/cpu-x86-uarch-abi.py /tmp/qmp
> > Traceback (most recent call last):
> >   File "/path-to-qemu/qemu/scripts/cpu-x86-uarch-abi.py", line 96, in <module>
> >     cpu = shell.cmd("query-cpu-model-expansion",
> > TypeError: QEMUMonitorProtocol.cmd() takes 2 positional arguments but 3 were given
> > 
> > Commit 7f521b023bc28 ("scripts/cpu-x86-uarch-abi.py: use .command()
> > instead of .cmd()") converts the the original .cmd() to .command()
> > (which was later renamed to "cmd" to replace the original one).
> > 
> > But the new .cmd() only accepts typing.Mapping as the parameter instead
> > of typing.Dict (see _qmp.execute()).
> > 
> > Change the paremeters of "query-cpu-model-expansion" to typing.Mapping
> > format to fix this error.
> > 
> > Fixes: 7f521b023bc28 ("scripts/cpu-x86-uarch-abi.py: use .command() instead of .cmd()")
> > Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
> > ---
> >  scripts/cpu-x86-uarch-abi.py | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
> 
> I'll queue this one and sent a PULL before the final release.
> 

Thanks!

Regards,
Zhao

> 
> With regards,
> Daniel
> -- 
> |: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
> |: https://libvirt.org         -o-            https://fstop138.berrange.com :|
> |: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
> 


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2023-11-07 14:51 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-18 10:00 [PATCH] scripts/cpu-x86-uarch-abi.py: Fix parameter error of cmd Zhao Liu
2023-10-18 10:18 ` Vladimir Sementsov-Ogievskiy
2023-10-18 14:15   ` Zhao Liu
2023-11-07 14:10 ` Zhao Liu
2023-11-07 14:15 ` Daniel P. Berrangé
2023-11-07 15:01   ` Zhao Liu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).