Changes in tools/ew.py [13eecc4:d4b7b29] in mainline

File:

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

tools/ew.py

@@ -135 +135 @@
         hdisk_mk()
 
-        hdd_options = ''
-        if 'hdd' in overrides.keys():
-                if 'ata' in overrides['hdd'].keys():
-                        hdd_options += ''
-                elif 'virtio-blk' in overrides['hdd'].keys():
-                        hdd_options += ',if=virtio'
-
-        return ' -drive file=hdisk.img,index=0,media=disk,format=raw' + hdd_options
+        return ' -drive file=hdisk.img,index=0,media=disk,format=raw'
 
 def qemu_nic_ne2k_options():
@@ -343 +336 @@
 def usage():
         print("%s - emulator wrapper for running HelenOS\n" % os.path.basename(sys.argv[0]))
-        print("%s [-d] [-h] [-net e1k|rtl8139|ne2k|virtio-net] [-hdd ata|virtio-blk] [-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.")
@@ -364 +357 @@
 def run():
         expect_nic = False
-        expect_hdd = False
         expect_qemu = False
 
@@ -386 +378 @@
                         continue
 
-                if expect_hdd:
-                        expect_hdd = False
-                        if not 'hdd' in overrides.keys():
-                                overrides['hdd'] = {}
-                        if sys.argv[i] == 'ata':
-                                overrides['hdd']['ata'] = True
-                        elif sys.argv[i] == 'virtio-blk':
-                                overrides['hdd']['virtio-blk'] = True
-                        else:
-                                usage()
-                                exit()
-                        continue
-
                 if expect_qemu:
                         expect_qemu = False
@@ -410 +389 @@
                 elif sys.argv[i] == '-net' and i < len(sys.argv) - 1:
                         expect_nic = True
-                elif sys.argv[i] == '-hdd' and i < len(sys.argv) - 1:
-                        expect_hdd = True
                 elif sys.argv[i] == '-nohdd':
                         overrides['nohdd'] = True