[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 5/5] scripts/cpu-x86-uarch-abi.py: Fix parameter error of cmd
|
From: |
Daniel P . Berrangé |
|
Subject: |
[PULL 5/5] scripts/cpu-x86-uarch-abi.py: Fix parameter error of cmd |
|
Date: |
Tue, 7 Nov 2023 19:08:17 +0000 |
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()")
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>
---
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 f6baeeff24..052ddd7514 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.41.0
- [PULL 0/5] Misc fixes patches, Daniel P . Berrangé, 2023/11/07
- [PULL 1/5] crypto/rsakey-builtin.c.inc: Clean up two error paths, Daniel P . Berrangé, 2023/11/07
- [PULL 3/5] audio: don't abort on f32 audio format in wav backend, Daniel P . Berrangé, 2023/11/07
- [PULL 2/5] io: Stop appending -listen to net listeners, Daniel P . Berrangé, 2023/11/07
- [PULL 5/5] scripts/cpu-x86-uarch-abi.py: Fix parameter error of cmd,
Daniel P . Berrangé <=
- [PULL 4/5] MAINTAINERS: update libvirt devel mailing list address, Daniel P . Berrangé, 2023/11/07
- Re: [PULL 0/5] Misc fixes patches, Stefan Hajnoczi, 2023/11/08