Commit a004e249 authored Aug 18, 2017 by Lukáš Doktor Committed by Eduardo Habkost Sep 15, 2017

qemu.py: Use custom exceptions rather than Exception



The naked Exception should not be widely used. It makes sense to be a
bit more specific and use better-suited custom exceptions. As a benefit
we can store the full reply in the exception in case someone needs it
when catching the exception.

Signed-off-by: Lukáš Doktor <ldoktor@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20170818142613.32394-6-ldoktor@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

parent 41f714b1

scripts/qemu.py

+15 −2

Original line number	Diff line number	Diff line
		@@ -19,6 +19,19 @@ import subprocess
		import qmp.qmp


		class MonitorResponseError(qmp.qmp.QMPError):
		'''
		Represents erroneous QMP monitor reply
		'''
		def __init__(self, reply):
		try:
		desc = reply["error"]["desc"]
		except KeyError:
		desc = reply
		super(MonitorResponseError, self).__init__(desc)
		self.reply = reply


		class QEMUMachine(object):
		'''A QEMU VM

		@@ -213,9 +226,9 @@ class QEMUMachine(object):
		'''
		reply = self.qmp(cmd, conv_keys, **args)
		if reply is None:
		raise Exception("Monitor is closed")
		raise qmp.qmp.QMPError("Monitor is closed")
		if "error" in reply:
		raise Exception(reply["error"]["desc"])
		raise MonitorResponseError(reply)
		return reply["return"]

		def get_qmp_event(self, wait=False):