mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scripts/qmp-shell: Make verbose a public attribute

Browse Source 
No real reason to hide this behind an underscore; make it part of the
initializer and make it a regular RW attribute.
Signed-off-by: John Snow <jsnow@redhat.com>
Message-id: 20210607200649.1840382-20-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
This commit is contained in:
John Snow 2021-06-07 16:06:26 -04:00
parent ad459132c0
commit 2ac3f3786e
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/qmp/qmp-shell
View File

@ -113,7 +113,7 @@ class FuzzyJSON(ast.NodeTransformer):
# TODO: QMPShell's interface is a bit ugly (eg. _fill_completion() and # TODO: QMPShell's interface is a bit ugly (eg. _fill_completion() and
# _execute_cmd()). Let's design a better one. # _execute_cmd()). Let's design a better one.
class QMPShell(qmp.QEMUMonitorProtocol): class QMPShell(qmp.QEMUMonitorProtocol):
def __init__(self, address, pretty=False): def __init__(self, address, pretty=False, verbose=False):
super().__init__(self.parse_address(address)) super().__init__(self.parse_address(address))
self._greeting = None self._greeting = None
self._completer = None self._completer = None
@ -122,7 +122,7 @@ class QMPShell(qmp.QEMUMonitorProtocol):
self._actions = list() self._actions = list()
self._histfile = os.path.join(os.path.expanduser('~'), self._histfile = os.path.join(os.path.expanduser('~'),
'.qmp-shell_history') '.qmp-shell_history')
self._verbose = False self.verbose = verbose
def _fill_completion(self): def _fill_completion(self):
cmds = self.cmd('query-commands') cmds = self.cmd('query-commands')
@ -271,7 +271,7 @@ class QMPShell(qmp.QEMUMonitorProtocol):
# For transaction mode, we may have just cached the action: # For transaction mode, we may have just cached the action:
if qmpcmd is None: if qmpcmd is None:
return True return True
if self._verbose: if self.verbose:
self._print(qmpcmd) self._print(qmpcmd)
resp = self.cmd_obj(qmpcmd) resp = self.cmd_obj(qmpcmd)
if resp is None: if resp is None:
@ -317,13 +317,10 @@ class QMPShell(qmp.QEMUMonitorProtocol):
return self._execute_cmd(cmdline) return self._execute_cmd(cmdline)
def set_verbosity(self, verbose):
self._verbose = verbose
class HMPShell(QMPShell): class HMPShell(QMPShell):
def __init__(self, address, pretty=False): def __init__(self, address, pretty=False, verbose=False):
super().__init__(address, pretty) super().__init__(address, pretty, verbose)
self.__cpu_index = 0 self.__cpu_index = 0
def __cmd_completion(self): def __cmd_completion(self):
@ -423,7 +420,7 @@ def main():
shell_class = HMPShell if args.hmp else QMPShell shell_class = HMPShell if args.hmp else QMPShell
try: try:
qemu = shell_class(args.qmp_server, args.pretty) qemu = shell_class(args.qmp_server, args.pretty, args.verbose)
except qmp.QMPBadPortError: except qmp.QMPBadPortError:
parser.error(f"Bad port number: {args.qmp_server}") parser.error(f"Bad port number: {args.qmp_server}")
return # pycharm doesn't know error() is noreturn return # pycharm doesn't know error() is noreturn
@ -438,7 +435,6 @@ def main():
die(f"Couldn't connect to {args.qmp_server}: {err!s}") die(f"Couldn't connect to {args.qmp_server}: {err!s}")
qemu.show_banner() qemu.show_banner()
qemu.set_verbosity(args.verbose)
while qemu.read_exec_command(qemu.get_prompt()): while qemu.read_exec_command(qemu.get_prompt()):
pass pass
qemu.close() qemu.close()