|
 |
9bac43 |
From da96c55a017fbc750b49550c6e7a523dcdab0dbe Mon Sep 17 00:00:00 2001
|
|
|
9bac43 |
From: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9bac43 |
Date: Fri, 22 Dec 2017 11:08:41 +0100
|
|
|
9bac43 |
Subject: [PATCH 23/42] qemu.py: make VM() a context manager
|
|
|
9bac43 |
|
|
|
9bac43 |
RH-Author: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9bac43 |
Message-id: <20171222110900.24813-2-stefanha@redhat.com>
|
|
|
9bac43 |
Patchwork-id: 78483
|
|
|
9bac43 |
O-Subject: [RHV7.5 qemu-kvm-rhev PATCH 01/20] qemu.py: make VM() a context manager
|
|
|
9bac43 |
Bugzilla: 1519721
|
|
|
9bac43 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9bac43 |
|
|
|
9bac43 |
There are a number of ways to ensure that the QEMU process is shut down
|
|
|
9bac43 |
when the test ends, including atexit.register(), try: finally:, or
|
|
|
9bac43 |
unittest.teardown() methods. All of these require extra code and the
|
|
|
9bac43 |
programmer must remember to add vm.shutdown().
|
|
|
9bac43 |
|
|
|
9bac43 |
A nice solution is context managers:
|
|
|
9bac43 |
|
|
|
9bac43 |
with VM(binary) as vm:
|
|
|
9bac43 |
...
|
|
|
9bac43 |
# vm is guaranteed to be shut down here
|
|
|
9bac43 |
|
|
|
9bac43 |
Cc: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9bac43 |
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9bac43 |
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9bac43 |
Message-id: 20170824072202.26818-2-stefanha@redhat.com
|
|
|
9bac43 |
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9bac43 |
(cherry picked from commit d792bc3811f22a22a46c7d9a725fd29029f54095)
|
|
|
9bac43 |
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9bac43 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9bac43 |
---
|
|
|
9bac43 |
scripts/qemu.py | 16 +++++++++++++++-
|
|
|
9bac43 |
1 file changed, 15 insertions(+), 1 deletion(-)
|
|
|
9bac43 |
|
|
|
9bac43 |
diff --git a/scripts/qemu.py b/scripts/qemu.py
|
|
|
9bac43 |
index 880e3e8..4d8ee10 100644
|
|
|
9bac43 |
--- a/scripts/qemu.py
|
|
|
9bac43 |
+++ b/scripts/qemu.py
|
|
|
9bac43 |
@@ -21,7 +21,14 @@ import qmp.qmp
|
|
|
9bac43 |
|
|
|
9bac43 |
|
|
|
9bac43 |
class QEMUMachine(object):
|
|
|
9bac43 |
- '''A QEMU VM'''
|
|
|
9bac43 |
+ '''A QEMU VM
|
|
|
9bac43 |
+
|
|
|
9bac43 |
+ Use this object as a context manager to ensure the QEMU process terminates::
|
|
|
9bac43 |
+
|
|
|
9bac43 |
+ with VM(binary) as vm:
|
|
|
9bac43 |
+ ...
|
|
|
9bac43 |
+ # vm is guaranteed to be shut down here
|
|
|
9bac43 |
+ '''
|
|
|
9bac43 |
|
|
|
9bac43 |
def __init__(self, binary, args=[], wrapper=[], name=None, test_dir="/var/tmp",
|
|
|
9bac43 |
monitor_address=None, socket_scm_helper=None, debug=False):
|
|
|
9bac43 |
@@ -40,6 +47,13 @@ class QEMUMachine(object):
|
|
|
9bac43 |
self._socket_scm_helper = socket_scm_helper
|
|
|
9bac43 |
self._debug = debug
|
|
|
9bac43 |
|
|
|
9bac43 |
+ def __enter__(self):
|
|
|
9bac43 |
+ return self
|
|
|
9bac43 |
+
|
|
|
9bac43 |
+ def __exit__(self, exc_type, exc_val, exc_tb):
|
|
|
9bac43 |
+ self.shutdown()
|
|
|
9bac43 |
+ return False
|
|
|
9bac43 |
+
|
|
|
9bac43 |
# This can be used to add an unused monitor instance.
|
|
|
9bac43 |
def add_monitor_telnet(self, ip, port):
|
|
|
9bac43 |
args = 'tcp:%s:%d,server,nowait,telnet' % (ip, port)
|
|
|
9bac43 |
--
|
|
|
9bac43 |
1.8.3.1
|
|
|
9bac43 |
|