vng: support both --blk-disk and --disk in the vng CLI

This is a behavioral change (although one that brings the behavior
_in line_ with the documentation). Previously, `vng --disk` was
converted to `virtme-run --blk-disk` internally, contrary to the
`vng` help which is saying that `--disk` adds a virtio-scsi disk.

Support both `vng --disk` (which is converted to `virtme-run --disk`)
and `vng --blk-disk` (which is converted to `virtme-run --blk-disk`).

Signed-off-by: Ivan Shapovalov <intelfx@intelfx.name>

Author: intelfx

virtme_ng/run.py

@@ -433,6 +433,13 @@ def make_parser():
         help="Add a file as virtio-scsi disk (can be used multiple times)",
     )
 
+    parser.add_argument(
+        "--blk-disk",
+        action="append",
+        metavar="PATH",
+        help="Add a file as virtio-blk disk (can be used multiple times)",
+    )
+
     parser.add_argument(
         "--exec",
         "-e",
@@ -1161,13 +1168,24 @@ def _get_virtme_remote_cmd(self, args):
             self.virtme_param["remote_cmd"] = ""
 
     def _get_virtme_disk(self, args):
+        disk_str = ""
+
+        def ensure_name(dsk: str) -> str:
+            if "=" not in dsk:
+                return f"{dsk}={dsk}"
+            return dsk
+
         if args.disk is not None:
-            disk_str = ""
             for dsk in args.disk:
-                disk_str += f"--blk-disk {dsk}={dsk} "
-            self.virtme_param["disk"] = disk_str
-        else:
-            self.virtme_param["disk"] = ""
+                dsk = ensure_name(dsk)
+                disk_str += f"--disk {shlex.quote(dsk)} "
+
+        if args.blk_disk is not None:
+            for dsk in args.blk_disk:
+                dsk = ensure_name(dsk)
+                disk_str += f"--blk-disk {shlex.quote(dsk)} "
+
+        self.virtme_param["disk"] = disk_str
 
     def _get_virtme_sound(self, args):
         if args.sound: