Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 7337047 in mainline


Ignore:
Timestamp:
2021-11-08T15:31:56Z (3 weeks ago)
Author:
GitHub <noreply@…>
Parents:
0802ab6 (diff), e9c1639 (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:
Parth Patel <parth1020patel@…> (2021-11-08 15:31:56)
git-committer:
GitHub <noreply@…> (2021-11-08 15:31:56)
Message:

Merge e9c163920855901461396bd1009584b897c18dd0 into 0802ab6215bf030e8760c887b30ac3952086b9ef

File:
1 edited

Legend:

Unmodified
Added
Removed
  • tools/ew.py

    r0802ab6 r7337047  
    261261        cmd = 'qemu-' + suffix
    262262
     263        if cpus:
     264        cmd += ' -smp cpus=' + cpus + ' '
     265
    263266        cmdline = cmd
    264267        if 'qemu_path' in overrides.keys():
     
    436439def usage():
    437440        print("%s - emulator wrapper for running HelenOS\n" % os.path.basename(sys.argv[0]))
    438         print("%s [-d] [-h] [-net e1k|rtl8139|ne2k|virtio-net] [-hdd ata|virtio-blk] [-nohdd] [-nokvm] [-nonet] [-nosnd] [-nousb] [-noxhci] [-notablet]\n" %
     441        print("%s [$] [-d] [-h] [-net e1k|rtl8139|ne2k|virtio-net] [-hdd ata|virtio-blk] [-nohdd] [-nokvm] [-nonet] [-nosnd] [-nousb] [-noxhci] [-notablet]\n" %
    439442            os.path.basename(sys.argv[0]))
     443        print("$\t to run multiple($) cpus")
    440444        print("-d\tDry run: do not run the emulation, just print the command line.")
    441445        print("-h\tPrint the usage information and exit.")
     
    459463        expect_hdd = False
    460464        expect_qemu = False
     465        global cpus
     466    cpus = ''
    461467
    462468        for i in range(1, len(sys.argv)):
     
    499505                        usage()
    500506                        exit()
     507                elif sys.argv[i].isdigit():
     508            cpus = sys.argv[i]
    501509                elif sys.argv[i] == '-d':
    502510                        overrides['dryrun'] = True
Note: See TracChangeset for help on using the changeset viewer.