aboutsummaryrefslogtreecommitdiff
path: root/scripts/qmp
diff options
context:
space:
mode:
authorJohn Snow <jsnow@redhat.com>2021-06-04 11:55:25 -0400
committerJohn Snow <jsnow@redhat.com>2021-06-18 16:10:06 -0400
commit0cf1a52d289d69461df0d984aa50ec61f8a21c30 (patch)
tree524f5f8386d9981054460cc62e2febf5ab52fc1d /scripts/qmp
parente6de9ce90a67960a6477da5a5c69c19ce390ed1d (diff)
downloadqemu-0cf1a52d289d69461df0d984aa50ec61f8a21c30.zip
qemu-0cf1a52d289d69461df0d984aa50ec61f8a21c30.tar.gz
qemu-0cf1a52d289d69461df0d984aa50ec61f8a21c30.tar.bz2
scripts/qemu-ga-client: replace deprecated optparse with argparse
optparse isn't supported anymore, it's from the python2 days. Replace it with the mostly similar argparse. Signed-off-by: John Snow <jsnow@redhat.com> Message-id: 20210604155532.1499282-5-jsnow@redhat.com Signed-off-by: John Snow <jsnow@redhat.com>
Diffstat (limited to 'scripts/qmp')
-rwxr-xr-xscripts/qmp/qemu-ga-client34
1 files changed, 16 insertions, 18 deletions
diff --git a/scripts/qmp/qemu-ga-client b/scripts/qmp/qemu-ga-client
index 7aba09f..8eb4015 100755
--- a/scripts/qmp/qemu-ga-client
+++ b/scripts/qmp/qemu-ga-client
@@ -37,8 +37,8 @@
# See also: https://wiki.qemu.org/Features/QAPI/GuestAgent
#
+import argparse
import base64
-import optparse
import os
import random
import sys
@@ -255,7 +255,7 @@ def _cmd_reboot(client, args):
commands = [m.replace('_cmd_', '') for m in dir() if '_cmd_' in m]
-def main(address, cmd, args):
+def send_command(address, cmd, args):
if not os.path.exists(address):
print('%s not found' % address)
sys.exit(1)
@@ -283,25 +283,23 @@ def main(address, cmd, args):
globals()['_cmd_' + cmd](client, args)
-if __name__ == '__main__':
+def main():
address = os.environ.get('QGA_CLIENT_ADDRESS')
- usage = ("%prog [--address=<unix_path>|<ipv4_address>]"
- " <command> [args...]\n")
- usage += '<command>: ' + ', '.join(commands)
- parser = optparse.OptionParser(usage=usage)
- parser.add_option('--address', action='store', type='string',
- default=address,
- help='Specify a ip:port pair or a unix socket path')
- options, args = parser.parse_args()
-
- address = options.address
- if address is None:
+ parser = argparse.ArgumentParser()
+ parser.add_argument('--address', action='store',
+ default=address,
+ help='Specify a ip:port pair or a unix socket path')
+ parser.add_argument('command', choices=commands)
+ parser.add_argument('args', nargs='*')
+
+ args = parser.parse_args()
+ if args.address is None:
parser.error('address is not specified')
sys.exit(1)
- if len(args) == 0:
- parser.error('Less argument')
- sys.exit(1)
+ send_command(args.address, args.command, args.args)
+
- main(address, args[0], args[1:])
+if __name__ == '__main__':
+ main()