Re: [PATCH v2 15/25] scripts/render-block-graph: switch to AQMP

[Vladimir Sementsov-Ogievskiy]

15.12.2021 22:39, John Snow wrote:

Creating an instance of qemu.aqmp.ExecuteError is too involved here, so
just drop the specificity down to a generic AQMPError.

s/AQMPError/QMPError/  ?

Signed-off-by: John Snow <js...@redhat.com>

Reviewed-by: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com>

---
  scripts/render_block_graph.py | 8 +++-----
  1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/scripts/render_block_graph.py b/scripts/render_block_graph.py
index da6acf050d..97778927f3 100755
--- a/scripts/render_block_graph.py
+++ b/scripts/render_block_graph.py
@@ -25,10 +25,8 @@
  from graphviz import Digraph

sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'python'))

-from qemu.qmp import (
-    QEMUMonitorProtocol,
-    QMPResponseError,
-)
+from qemu.aqmp import QMPError
+from qemu.aqmp.legacy import QEMUMonitorProtocol

def perm(arr):

@@ -105,7 +103,7 @@ def command(self, cmd):
          reply = json.loads(subprocess.check_output(ar))

if 'error' in reply:

-            raise QMPResponseError(reply)
+            raise QMPError(reply)

return reply['return']

--
Best regards,
Vladimir