Changes in tools/ew.py [ae8d7b0:5119d34] in mainline

File:

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

tools/ew.py

@@ -160 +160 @@
         return ' -usb'
 
+def qemu_xhci_options():
+        if is_override('noxhci'):
+                return ''
+        return ' -device nec-usb-xhci,id=xhci'
+
 def qemu_audio_options():
         if is_override('nosnd'):
@@ -180 +185 @@
         if (not 'usb' in cfg.keys()) or cfg['usb']:
                 cmdline += qemu_usb_options()
+        if (not 'xhci' in cfg.keys()) or cfg['xhci']:
+                cmdline += qemu_xhci_options()
         if (not 'audio' in cfg.keys()) or cfg['audio']:
                 cmdline += qemu_audio_options()
@@ -212 +219 @@
 
 def spike_run(platform, machine, processor):
-        run_in_console('spike -m1073741824:1073741824 image.boot', 'HelenOS/risvc64 on Spike')
+        run_in_console('spike image.boot', 'HelenOS/risvc64 on Spike')
 
 emulators = {
@@ -286 +293 @@
 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]\n" %
+        print("%s [-d] [-h] [-net e1k|rtl8139|ne2k] [-nohdd] [-nokvm] [-nonet] [-nosnd] [-nousb] [-noxhci]\n" %
             os.path.basename(sys.argv[0]))
         print("-d\tDry run: do not run the emulation, just print the command line.")
@@ -295 +302 @@
         print("-nosnd\tDisable sound, if applicable.")
         print("-nousb\tDisable USB support, if applicable.")
+        print("-noxhci\tDisable XHCI support, if applicable.")
 
 def fail(platform, machine):
@@ -336 +344 @@
                 elif sys.argv[i] == '-nousb':
                         overrides['nousb'] = True
+                elif sys.argv[i] == '-noxhci':
+                        overrides['noxhci'] = True
                 else:
                         usage()