| Message ID | 20180329213857.15499-9-ehabkost@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | QEMU validator: A method to specify QEMU crash-test cases | expand |
On 03/29/2018 06:38 PM, Eduardo Habkost wrote: > This way all shutdown-related cleanup is kept in a single place. > > While at it, set _qmp to None after closing the socket, to avoid > trying to reuse it by mistake later. > > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > scripts/qemu.py | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/scripts/qemu.py b/scripts/qemu.py > index 4a71542c6b..1241e7f10b 100644 > --- a/scripts/qemu.py > +++ b/scripts/qemu.py > @@ -199,6 +199,10 @@ class QEMUMachine(object): > self._qmp.accept() > > def _post_shutdown(self): > + if self._qmp is not None: > + self._qmp.close() > + self._qmp = None > + > self._load_io_log() > if self._qemu_log_file is not None: > self._qemu_log_file.close() > @@ -250,7 +254,6 @@ class QEMUMachine(object): > def wait(self): > '''Wait for the VM to power off''' > self._popen.wait() > - self._qmp.close() > self._post_shutdown() > > def shutdown(self): >
diff --git a/scripts/qemu.py b/scripts/qemu.py index 4a71542c6b..1241e7f10b 100644 --- a/scripts/qemu.py +++ b/scripts/qemu.py @@ -199,6 +199,10 @@ class QEMUMachine(object): self._qmp.accept() def _post_shutdown(self): + if self._qmp is not None: + self._qmp.close() + self._qmp = None + self._load_io_log() if self._qemu_log_file is not None: self._qemu_log_file.close() @@ -250,7 +254,6 @@ class QEMUMachine(object): def wait(self): '''Wait for the VM to power off''' self._popen.wait() - self._qmp.close() self._post_shutdown() def shutdown(self):
This way all shutdown-related cleanup is kept in a single place. While at it, set _qmp to None after closing the socket, to avoid trying to reuse it by mistake later. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- scripts/qemu.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)