Changeset fbfe59d in mainline for tools/ew.py

Timestamp:

2018-06-25T21:45:05Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8119363

Parents:

2498b95 (diff), e3107e2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'virtio-net'

This commit merges basic support for the virtio-net NIC. As of now, the
driver does not support any advanced features that might be supported by
the device. Also device removal is not yet supported.

File:

• tools/ew.py (modified) (4 diffs)

tools/ew.py

@@ -146 +146 @@
         return ' -device rtl8139,vlan=0'
 
+def qemu_nic_virtio_options():
+        return ' -device virtio-net,vlan=0'
+
 def qemu_net_options():
         if is_override('nonet'):
@@ -158 +161 @@
                 if 'ne2k' in overrides['net'].keys():
                         nic_options += qemu_nic_ne2k_options()
+                if 'virtio-net' in overrides['net'].keys():
+                        nic_options += qemu_nic_virtio_options()
         else:
                 # Use the default NIC
@@ -326 +331 @@
 def usage():
         print("%s - emulator wrapper for running HelenOS\n" % os.path.basename(sys.argv[0]))
-        print("%s [-d] [-h] [-net e1k|rtl8139|ne2k] [-nohdd] [-nokvm] [-nonet] [-nosnd] [-nousb] [-noxhci] [-notablet]\n" %
+        print("%s [-d] [-h] [-net e1k|rtl8139|ne2k|virtio-net] [-nohdd] [-nokvm] [-nonet] [-nosnd] [-nousb] [-noxhci] [-notablet]\n" %
             os.path.basename(sys.argv[0]))
         print("-d\tDry run: do not run the emulation, just print the command line.")
@@ -360 +365 @@
                         elif sys.argv[i] == 'ne2k':
                                 overrides['net']['ne2k'] = True
+                        elif sys.argv[i] == 'virtio-net':
+                                overrides['net']['virtio-net'] = True
                         else:
                                 usage()