qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Wainer dos Santos Moschetta <wainersm@redhat.com>
To: qemu-devel@nongnu.org
Cc: jsnow@redhat.com, philmd@redhat.com, ehabkost@redhat.com,
	crosa@redhat.com
Subject: [PATCH v2 4/5] python/qemu: qmp: Make QEMUMonitorProtocol a context manager
Date: Tue,  4 Feb 2020 11:11:10 -0300	[thread overview]
Message-ID: <20200204141111.3207-5-wainersm@redhat.com> (raw)
In-Reply-To: <20200204141111.3207-1-wainersm@redhat.com>

This implement the __enter__ and __exit__ functions on
QEMUMonitorProtocol class so that it can be used on 'with'
statement and the resources will be free up on block end:

with QEMUMonitorProtocol(socket_path) as qmp:
    qmp.connect()
    qmp.command('query-status')

Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
---
 python/qemu/qmp.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/python/qemu/qmp.py b/python/qemu/qmp.py
index 0e07d80e2a..486a566da0 100644
--- a/python/qemu/qmp.py
+++ b/python/qemu/qmp.py
@@ -139,6 +139,15 @@ class QEMUMonitorProtocol:
                 raise QMPConnectError("Error while reading from socket")
             self.__sock.settimeout(None)
 
+    def __enter__(self):
+        # Implement context manager enter function.
+        return self
+
+    def __exit__(self, exc_type, exc_value, exc_traceback):
+        # Implement context manager exit function.
+        self.close()
+        return False
+
     def connect(self, negotiate=True):
         """
         Connect to the QMP Monitor and perform capabilities negotiation.
@@ -265,8 +274,10 @@ class QEMUMonitorProtocol:
         """
         Close the socket and socket file.
         """
-        self.__sock.close()
-        self.__sockfile.close()
+        if self.__sock:
+            self.__sock.close()
+        if self.__sockfile:
+            self.__sockfile.close()
 
     def settimeout(self, timeout):
         """
-- 
2.23.0



  parent reply	other threads:[~2020-02-04 14:15 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-04 14:11 [PATCH v2 0/5] python/qemu: qmp: Fix, delint and improvements Wainer dos Santos Moschetta
2020-02-04 14:11 ` [PATCH v2 1/5] python/qemu: qmp: Replace socket.error with OSError Wainer dos Santos Moschetta
2020-02-04 14:11 ` [PATCH v2 2/5] python/qemu: Delint the qmp module Wainer dos Santos Moschetta
2020-02-04 14:11 ` [PATCH v2 3/5] python/qemu: qmp: Make accept()'s timeout configurable Wainer dos Santos Moschetta
2020-02-05 23:28   ` John Snow
2020-02-04 14:11 ` Wainer dos Santos Moschetta [this message]
2020-02-05 23:43   ` [PATCH v2 4/5] python/qemu: qmp: Make QEMUMonitorProtocol a context manager John Snow
2020-02-04 14:11 ` [PATCH v2 5/5] python/qemu: qmp: Remove unnused attributes Wainer dos Santos Moschetta
2020-02-06 14:52 ` [PATCH v2 0/5] python/qemu: qmp: Fix, delint and improvements Philippe Mathieu-Daudé

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200204141111.3207-5-wainersm@redhat.com \
    --to=wainersm@redhat.com \
    --cc=crosa@redhat.com \
    --cc=ehabkost@redhat.com \
    --cc=jsnow@redhat.com \
    --cc=philmd@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).