Changeset d5a89a3 in mainline for tools

Timestamp:

2019-02-11T22:31:04Z (7 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

aaf9789c

Parents:

e3272101 (diff), 4805495 (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:

merging with upstream/master

Location:

tools

Files:

• autotool.py (modified) (1 diff)
• build-ccheck.sh (modified) (2 diffs)
• ew.py (modified) (5 diffs)

tools/autotool.py

@@ -1 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 #
 # Copyright (c) 2010 Martin Decky

tools/build-ccheck.sh

@@ -1 +1 @@
 #!/bin/bash
 #
-# Copyright (c) 2018 Jiri Svoboda
+# Copyright (c) 2019 Jiri Svoboda
 # All rights reserved.
 #
@@ -29 +29 @@
 
 SYCEK_GIT="https://github.com/jxsvoboda/sycek"
-SYCEK_REV="42fe0d77819f0ec05f17e40ea54c7b62073c8e97"
+SYCEK_REV="eaa42806e3894fb41ba6bd79fab96e1ae8720f29"
 
 if [ ! -d sycek ]; then

tools/ew.py

@@ -135 +135 @@
         hdisk_mk()
 
-        return ' -drive file=hdisk.img,index=0,media=disk,format=raw'
+        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
 
 def qemu_nic_ne2k_options():
@@ -336 +343 @@
 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] [-nohdd] [-nokvm] [-nonet] [-nosnd] [-nousb] [-noxhci] [-notablet]\n" %
+        print("%s [-d] [-h] [-net e1k|rtl8139|ne2k|virtio-net] [-hdd ata|virtio-blk] [-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.")
@@ -357 +364 @@
 def run():
         expect_nic = False
+        expect_hdd = False
         expect_qemu = False
 
@@ -378 +386 @@
                         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
@@ -389 +410 @@
                 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