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

[Zhao Liu]

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