Use the new preferred low level option for configuring the QMP service in libqtest and the python Machine class used by tests. This will avoid triggering deprecation warnings after the subsequent commit. Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Tested-by: Peter Krempa <pkrempa@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- python/qemu/machine/machine.py | 4 ++-- tests/qtest/libqtest.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/python/qemu/machine/machine.py b/python/qemu/machine/machine.py index 3670c8cd39..bfb59d4c0b 100644 --- a/python/qemu/machine/machine.py +++ b/python/qemu/machine/machine.py @@ -304,8 +304,8 @@ def _harness_args(self) -> List[str]: ) else: moncdev = f"socket,id=mon,path={self._monitor_address}" - args.extend(['-chardev', moncdev, '-mon', - 'chardev=mon,mode=control']) + args.extend(['-chardev', moncdev, '-object', + 'monitor-qmp,id=qmp,chardev=mon']) return args def _console_args(self, interactive: bool = False) -> List[str]: diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c index 4e22c66b75..c33c799c92 100644 --- a/tests/qtest/libqtest.c +++ b/tests/qtest/libqtest.c @@ -460,7 +460,7 @@ gchar *qtest_qemu_args(const char *extra_args) "-qtest unix:%s " "-qtest-log %s " "-chardev socket,path=%s,id=char0 " - "-mon chardev=char0,mode=control " + "-object monitor-qmp,id=qmp0,chardev=char0 " "-display none " "-audio none " "%s " -- 2.54.0