Browse Source

iotests: Add @has_quit to vm.shutdown()

If a test has issued a quit command already (which may be useful to do
explicitly because the test wants to show its effects),
QEMUMachine.shutdown() should not do so again.  Otherwise, the VM may
well return an ECONNRESET which will lead QEMUMachine.shutdown() to
killing it, which then turns into a "qemu received signal 9" line.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
tags/v4.1.0-rc2
Max Reitz 2 months ago
parent
commit
4687133b81
2 changed files with 4 additions and 3 deletions
  1. 3
    2
      python/qemu/machine.py
  2. 1
    1
      tests/qemu-iotests/255

+ 3
- 2
python/qemu/machine.py View File

@@ -329,13 +329,14 @@ class QEMUMachine(object):
self._load_io_log()
self._post_shutdown()

def shutdown(self):
def shutdown(self, has_quit=False):
"""
Terminate the VM and clean up
"""
if self.is_running():
try:
self._qmp.cmd('quit')
if not has_quit:
self._qmp.cmd('quit')
self._qmp.close()
except:
self._popen.kill()

+ 1
- 1
tests/qemu-iotests/255 View File

@@ -132,4 +132,4 @@ with iotests.FilePath('src.qcow2') as src_path, \
vm.qmp_log('block-job-cancel', device='job0')
vm.qmp_log('quit')

vm.shutdown()
vm.shutdown(has_quit=True)

Loading…
Cancel
Save