[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/3] qemu.py: make VM() a context manager
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 1/3] qemu.py: make VM() a context manager |
Date: |
Thu, 24 Aug 2017 08:22:00 +0100 |
There are a number of ways to ensure that the QEMU process is shut down
when the test ends, including atexit.register(), try: finally:, or
unittest.teardown() methods. All of these require extra code and the
programmer must remember to add vm.shutdown().
A nice solution is context managers:
with VM(binary) as vm:
...
# vm is guaranteed to be shut down here
Cc: Eduardo Habkost <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
scripts/qemu.py | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/scripts/qemu.py b/scripts/qemu.py
index 880e3e8219..4d8ee10943 100644
--- a/scripts/qemu.py
+++ b/scripts/qemu.py
@@ -21,7 +21,14 @@ import qmp.qmp
class QEMUMachine(object):
- '''A QEMU VM'''
+ '''A QEMU VM
+
+ Use this object as a context manager to ensure the QEMU process
terminates::
+
+ with VM(binary) as vm:
+ ...
+ # vm is guaranteed to be shut down here
+ '''
def __init__(self, binary, args=[], wrapper=[], name=None,
test_dir="/var/tmp",
monitor_address=None, socket_scm_helper=None, debug=False):
@@ -40,6 +47,13 @@ class QEMUMachine(object):
self._socket_scm_helper = socket_scm_helper
self._debug = debug
+ def __enter__(self):
+ return self
+
+ def __exit__(self, exc_type, exc_val, exc_tb):
+ self.shutdown()
+ return False
+
# This can be used to add an unused monitor instance.
def add_monitor_telnet(self, ip, port):
args = 'tcp:%s:%d,server,nowait,telnet' % (ip, port)
--
2.13.5
- [Qemu-devel] [PATCH 0/3] iotests: clean up resources using context managers, Stefan Hajnoczi, 2017/08/24
- [Qemu-devel] [PATCH 2/3] iotests.py: add FilePath context manager, Stefan Hajnoczi, 2017/08/24
- [Qemu-devel] [PATCH 1/3] qemu.py: make VM() a context manager,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH 3/3] qemu-iotests: use context managers for resource cleanup in 194, Stefan Hajnoczi, 2017/08/24
- Re: [Qemu-devel] [PATCH 0/3] iotests: clean up resources using context managers, Fam Zheng, 2017/08/24
- Re: [Qemu-devel] [PATCH 0/3] iotests: clean up resources using context managers, Stefan Hajnoczi, 2017/08/24
- Re: [Qemu-devel] [PATCH 0/3] iotests: clean up resources using context managers, Fam Zheng, 2017/08/25
- Re: [Qemu-devel] [PATCH 0/3] iotests: clean up resources using context managers, Stefan Hajnoczi, 2017/08/25
- Re: [Qemu-devel] [PATCH 0/3] iotests: clean up resources using context managers, Fam Zheng, 2017/08/25
- Re: [Qemu-devel] [PATCH 0/3] iotests: clean up resources using context managers, Stefan Hajnoczi, 2017/08/30
- Re: [Qemu-devel] [PATCH 0/3] iotests: clean up resources using context managers, Fam Zheng, 2017/08/30
- Re: [Qemu-devel] [PATCH 0/3] iotests: clean up resources using context managers, Markus Armbruster, 2017/08/28