mirror of
https://git.yoctoproject.org/poky
synced 2026-06-01 00:59:48 +00:00
qemurunner.py: Fix error on calls to run_monitor
A change in QEMUMonitorProtocol.cmd() requires that we either pass in kwargs instead of an argument dict or move to cmd_raw() cmd() was renamed to cmd_raw() (and command() was renamed to cmd()) See: https://github.com/qemu/qemu/commit/37274707f6f3868fae7e0055d9a703006fc142d0 https://github.com/qemu/qemu/commit/684750ab4f8a3ad69512b71532408be3ac2547d4 My concern with this patch is that I haven't seen this come up with utils/dump.py which also uses QemuMonitor's run_monitor. If it is occuring, this should fix issues there as well (From OE-Core rev: 9665d38ab60c1c3b27887c2b1a6396f13a1b33ea) Signed-off-by: Eilís 'pidge' Ní Fhlannagáin <pidge@baylibre.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
02201e986d
commit
b9e9693cb0
@@ -650,9 +650,9 @@ class QemuRunner:
|
|||||||
if hasattr(self, 'qmp') and self.qmp:
|
if hasattr(self, 'qmp') and self.qmp:
|
||||||
self.qmp.settimeout(timeout)
|
self.qmp.settimeout(timeout)
|
||||||
if args is not None:
|
if args is not None:
|
||||||
return self.qmp.cmd(command, args)
|
return self.qmp.cmd_raw(command, args)
|
||||||
else:
|
else:
|
||||||
return self.qmp.cmd(command)
|
return self.qmp.cmd_raw(command)
|
||||||
|
|
||||||
def run_serial(self, command, raw=False, timeout=60):
|
def run_serial(self, command, raw=False, timeout=60):
|
||||||
# Returns (status, output) where status is 1 on success and 0 on error
|
# Returns (status, output) where status is 1 on success and 0 on error
|
||||||
|
|||||||
Reference in New Issue
Block a user