tools/qvm-ls: add --network and --disk compatibility options

Shortcuts for new --format=...

doc/manpages/qvm-ls.rst

@@ -53,6 +53,14 @@ Options
    Give plain list of VM names, without header or separator. Useful in scripts.
    Same as --raw-data --fields=name
 
+.. option:: --disk, -d
+
+   Same as --format=disk, for compatibility with Qubes 3.x
+
+.. option:: --network, -n
+
+   Same as --format=network, for compatibility with Qubes 3.x
+
 .. option:: --verbose, -v
 
    Increase verbosity.

qubesadmin/tools/qvm_ls.py

@@ -543,6 +543,14 @@ def get_parser():
     parser.add_argument('--raw-list', action='store_true',
         help='Same as --raw-data --fields=name')
 
+    parser.add_argument('--disk', '-d',
+        action='store_const', dest='format', const='disk',
+        help='Same as --format=disk')
+
+    parser.add_argument('--network', '-n',
+        action='store_const', dest='format', const='network',
+        help='Same as --format=network')
+
     parser.set_defaults(spinner=True)
 
 #   parser.add_argument('--conf', '-c',