Test 045 (TestSCMFd) is adding a null HMP monitor via add_monitor_null() to exercise fd operations with two monitors present. With HMP disabled, -monitor null is no longer valid.
Remove the add_monitor_null() call and the now-unused method from the Python machine module. Signed-off-by: Marc-André Lureau <[email protected]> --- python/qemu/machine/machine.py | 7 ------- tests/qemu-iotests/045 | 6 +----- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/python/qemu/machine/machine.py b/python/qemu/machine/machine.py index 393750655589..71b4696227f6 100644 --- a/python/qemu/machine/machine.py +++ b/python/qemu/machine/machine.py @@ -202,13 +202,6 @@ def __exit__(self, exc_tb: Optional[TracebackType]) -> None: self.shutdown() - def add_monitor_null(self) -> None: - """ - This can be used to add an unused monitor instance. - """ - self._args.append('-monitor') - self._args.append('null') - def add_fd(self: _T, fd: int, fdset: int, opaque: str, opts: str = '') -> _T: """ diff --git a/tests/qemu-iotests/045 b/tests/qemu-iotests/045 index cd1b35edb17f..900bf85220f7 100755 --- a/tests/qemu-iotests/045 +++ b/tests/qemu-iotests/045 @@ -129,9 +129,6 @@ class TestSCMFd(iotests.QMPTestCase): def setUp(self): self.vm = iotests.VM() qemu_img('create', '-f', iotests.imgfmt, image0, '128K') - # Add an unused monitor, to verify it works fine when two monitor - # instances present - self.vm.add_monitor_null() self.vm.launch() def tearDown(self): @@ -172,5 +169,4 @@ class TestSCMFd(iotests.QMPTestCase): if __name__ == '__main__': iotests.main(supported_fmts=['raw'], - supported_protocols=['file'], - require_hmp=True) + supported_protocols=['file']) -- 2.56.0.rc0.29.g47ce80527c56
