diff options
| author | Zhao Liu <zhao1.liu@intel.com> | 2023-10-18 18:00:11 +0800 |
|---|---|---|
| committer | Daniel P. Berrangé <berrange@redhat.com> | 2023-11-07 16:45:18 +0000 |
| commit | 3e7ebf58e808afb422e5000bbf77dc4aa88dd6e6 (patch) | |
| tree | ba593fb3eac0736c828d7f9c98264fa093d171ab | |
| parent | cc9118f240e125d33d9d0d31dcd0fa017683b042 (diff) | |
| download | qemu-3e7ebf58e808afb422e5000bbf77dc4aa88dd6e6.zip qemu-3e7ebf58e808afb422e5000bbf77dc4aa88dd6e6.tar.gz qemu-3e7ebf58e808afb422e5000bbf77dc4aa88dd6e6.tar.bz2 | |
scripts/cpu-x86-uarch-abi.py: Fix parameter error of cmd
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()")
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
| -rw-r--r-- | scripts/cpu-x86-uarch-abi.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/cpu-x86-uarch-abi.py b/scripts/cpu-x86-uarch-abi.py index f6baeef..052ddd7 100644 --- a/scripts/cpu-x86-uarch-abi.py +++ b/scripts/cpu-x86-uarch-abi.py @@ -94,8 +94,8 @@ models = {} 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(): |