Changeset dc5c303 in mainline for tools/ew.py

Timestamp:

2023-12-28T13:59:23Z (14 months ago)

Author:

GitHub <noreply@…>

Children:

6b66de6b

Parents:

42c2e65 (diff), f87ff8e (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.

git-author:

boba-buba <120932204+boba-buba@…> (2023-12-28 13:59:23)

git-committer:

GitHub <noreply@…> (2023-12-28 13:59:23)

Message:

Merge branch 'master' into topic/packet-capture

File:

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

tools/ew.py

@@ -79 +79 @@
         for termemu in emus:
                 try:
-                        subprocess.check_output('which ' + termemu, shell = True)
+                        subprocess.check_output('which ' + termemu, shell = True, stderr = subprocess.STDOUT)
                         return termemu
                 except:
@@ -331 +331 @@
 def msim_run(platform, machine, processor):
         hdisk_mk()
-        run_in_console('msim -c ' + TOOLS_DIR + '/conf/msim.conf', 'HelenOS/mips32 on msim')
+        run_in_console('msim -n -c ' + TOOLS_DIR + '/conf/msim.conf', 'HelenOS/mips32 on msim')
 
 def spike_run(platform, machine, processor):
@@ -422 +422 @@
                         'sun4v' : {
                                 'run' : qemu_run,
-                                'image' : '-drive if=pflash,readonly=on,file=image.iso',
+                                # QEMU 8.0.0 ignores the 'file' argument and instead uses 'id',
+                                # which defaults to 'pflash0', but can be changed to the same value
+                                # as 'file'
+                                'image' : '-drive if=pflash,id=image.iso,readonly=on,file=image.iso',
                                 'audio' : False,
                                 'console' : True,