starred/qemu-qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2026-07-08 17:46:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: switch from -mon to -object monitor-qmp

Browse Source 
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>
Message-ID: <20260706135824.2623960-34-berrange@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Daniel P. Berrangé
2026-07-06 14:58:21 +01:00
committed by Markus Armbruster
parent 6c479e70e2
commit 05e4982dfc
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
python/qemu/machine/machine.py
View File

@@ -304,8 +304,8 @@ class QEMUMachine:
) )
else: else:
moncdev = f"socket,id=mon,path={self._monitor_address}" moncdev = f"socket,id=mon,path={self._monitor_address}"
args.extend(['-chardev', moncdev, '-mon', args.extend(['-chardev', moncdev, '-object',
'chardev=mon,mode=control']) 'monitor-qmp,id=qmp,chardev=mon'])
return args return args
def _console_args(self, interactive: bool = False) -> List[str]: def _console_args(self, interactive: bool = False) -> List[str]:

2
tests/qtest/libqtest.c
View File

@@ -460,7 +460,7 @@ gchar *qtest_qemu_args(const char *extra_args)
"-qtest unix:%s " "-qtest unix:%s "
"-qtest-log %s " "-qtest-log %s "
"-chardev socket,path=%s,id=char0 " "-chardev socket,path=%s,id=char0 "
"-mon chardev=char0,mode=control " "-object monitor-qmp,id=qmp0,chardev=char0 "
"-display none " "-display none "
"-audio none " "-audio none "
"%s " "%s "