Changes in tools/ew.py [abf8bd8:2fc9bfd] in mainline

File:

• tools/ew.py (modified) (7 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
@@ -211 +216 @@
         if (is_override('nographic')):
                 cmdline += ' -nographic'
+
+        if ((not is_override('nographic')) and not is_override('noserial')):
+                cmdline += ' -serial stdio'
 
         if (is_override('bigmem')):
@@ -326 +334 @@
 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.")
@@ -338 +346 @@
         print("-notablet\tDisable USB tablet (use only relative-position PS/2 mouse instead), if applicable.")
         print("-nographic\tDisable graphical output. Serial port output must be enabled for this to be useful.")
+        print("-noserial\tDisable serial port output in the terminal.")
         print("-bigmem\tSets maximum RAM size to 4GB.")
 
@@ -360 +369 @@
                         elif sys.argv[i] == 'ne2k':
                                 overrides['net']['ne2k'] = True
+                        elif sys.argv[i] == 'virtio-net':
+                                overrides['net']['virtio-net'] = True
                         else:
                                 usage()
@@ -394 +405 @@
                 elif sys.argv[i] == '-bigmem':
                         overrides['bigmem'] = True
+                elif sys.argv[i] == '-noserial':
+                        overrides['noserial'] = True
                 elif sys.argv[i] == '-qemu_path' and i < len(sys.argv) - 1:
                         expect_qemu = True