Merge pull request #103 from jpirko/net_loop

Introduce "--network loop" device type and allow "--network" option to be passed multiple times

virtme/commands/run.py

@@ -112,10 +112,10 @@ def make_parser() -> argparse.ArgumentParser:
     )
     g.add_argument(
         "--net",
-        action="store",
+        action="append",
         const="user",
         nargs="?",
-        choices=["user", "bridge"],
+        choices=["user", "bridge", "loop"],
         help="Enable basic network access.",
     )
     g.add_argument(
@@ -1234,16 +1234,29 @@ def do_script(shellcmd: str, ret_path=None, show_boot_console=False) -> None:
             qemuargs.extend(video_args)
 
     if args.net:
-        qemuargs.extend(["-device", "%s,netdev=n0" % arch.virtio_dev_type("net")])
-        if args.net == "user":
-            qemuargs.extend(["-netdev", "user,id=n0"])
-        elif args.net == "bridge":
-            qemuargs.extend(["-netdev", "bridge,id=n0,br=virbr0"])
-        else:
-            assert False
+        extend_dhcp = False
+        index = 0
+        for net in args.net:
+            qemuargs.extend(["-device", "%s,netdev=n%d" % (arch.virtio_dev_type("net"), index)])
+            if net == "user":
+                qemuargs.extend(["-netdev", "user,id=n%d" % index])
+                extend_dhcp = True
+            elif net == "bridge":
+                qemuargs.extend(["-netdev", "bridge,id=n%d,br=virbr0" % index])
+                extend_dhcp = True
+            elif net == "loop":
+                hubid = index
+                qemuargs.extend(["-netdev", "hubport,id=n%d,hubid=%d" % (index, hubid)])
+                index += 1
+                qemuargs.extend(["-device", "%s,netdev=n%d" % (arch.virtio_dev_type("net"), index)])
+                qemuargs.extend(["-netdev", "hubport,id=n%d,hubid=%d" % (index, hubid)])
+            else:
+                assert False
+            index += 1
+        if extend_dhcp:
+            kernelargs.extend(["virtme.dhcp"])
         kernelargs.extend(
             [
-                "virtme.dhcp",
                 # Prevent annoying interface renaming
                 "net.ifnames=0",
                 "biosdevname=0",

virtme_ng/run.py

@@ -311,8 +311,8 @@ def make_parser():
     parser.add_argument(
         "--network",
         "-n",
-        action="store",
-        metavar="user|bridge",
+        action="append",
+        choices=['user', 'bridge', 'loop'],
         help="Enable network access",
     )
 
@@ -845,7 +845,8 @@ def _get_virtme_no_virtme_ng_init(self, args):
 
     def _get_virtme_network(self, args):
         if args.network is not None:
-            self.virtme_param["network"] = f"--net {args.network}"
+            network_str = " ".join([f"--net {network}" for network in args.network])
+            self.virtme_param["network"] = network_str
         else:
             self.virtme_param["network"] = ""