diff options
| author | John Snow <jsnow@redhat.com> | 2021-06-02 20:37:03 -0400 |
|---|---|---|
| committer | John Snow <jsnow@redhat.com> | 2021-06-18 16:10:06 -0400 |
| commit | 587adaca55e825412e54cbc9f9f20e86a6d68a72 (patch) | |
| tree | 54a40ed1b43ef0df8ca00366816c4d88f8527b0e /scripts/qmp | |
| parent | 5d15c9b875d2102143835ac989954a59a53d2b20 (diff) | |
| download | qemu-587adaca55e825412e54cbc9f9f20e86a6d68a72.zip qemu-587adaca55e825412e54cbc9f9f20e86a6d68a72.tar.gz qemu-587adaca55e825412e54cbc9f9f20e86a6d68a72.tar.bz2 | |
python/qmp: add parse_address classmethod
This takes the place of qmp-shell's __get_address function. It also
allows other utilities to share the same parser and syntax for
specifying QMP locations.
Signed-off-by: John Snow <jsnow@redhat.com>
Message-id: 20210603003719.1321369-4-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
Diffstat (limited to 'scripts/qmp')
| -rwxr-xr-x | scripts/qmp/qmp-shell | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/scripts/qmp/qmp-shell b/scripts/qmp/qmp-shell index b4d0609..d5ae8a9 100755 --- a/scripts/qmp/qmp-shell +++ b/scripts/qmp/qmp-shell @@ -89,8 +89,6 @@ class QMPCompleter(list): class QMPShellError(Exception): pass -class QMPShellBadPort(QMPShellError): - pass class FuzzyJSON(ast.NodeTransformer): '''This extension of ast.NodeTransformer filters literal "true/false/null" @@ -109,7 +107,7 @@ class FuzzyJSON(ast.NodeTransformer): # _execute_cmd()). Let's design a better one. class QMPShell(qmp.QEMUMonitorProtocol): def __init__(self, address, pretty=False): - super(QMPShell, self).__init__(self.__get_address(address)) + super(QMPShell, self).__init__(self.parse_address(address)) self._greeting = None self._completer = None self._pretty = pretty @@ -118,21 +116,6 @@ class QMPShell(qmp.QEMUMonitorProtocol): self._histfile = os.path.join(os.path.expanduser('~'), '.qmp-shell_history') - def __get_address(self, arg): - """ - Figure out if the argument is in the port:host form, if it's not it's - probably a file path. - """ - addr = arg.split(':') - if len(addr) == 2: - try: - port = int(addr[1]) - except ValueError: - raise QMPShellBadPort - return ( addr[0], port ) - # socket path - return arg - def _fill_completion(self): cmds = self.cmd('query-commands') if 'error' in cmds: @@ -437,7 +420,7 @@ def main(): if qemu is None: fail_cmdline() - except QMPShellBadPort: + except qmp.QMPBadPortError: die('bad port number in command-line') try: |