diff options
| author | klaar36 <klas.arvidsson@liu.se> | 2016-05-04 22:11:08 +0200 |
|---|---|---|
| committer | klaar36 <klas.arvidsson@liu.se> | 2016-05-04 22:11:08 +0200 |
| commit | e589c37199b3aa54d1cb8475fcf15651c79bc85c (patch) | |
| tree | e63bb06daa0fdfa96845dd6f956972fa0fe4260c /src/utils | |
| parent | 567ecc51396b0bbda45b21edee19154afebe5814 (diff) | |
| parent | 0db56a417f401d4685ed1206a760731fb14c5dd5 (diff) | |
| download | pintos-rs-e589c37199b3aa54d1cb8475fcf15651c79bc85c.tar.gz | |
Merge commit '0db56a4' antsu qemu-system-i386
Diffstat (limited to 'src/utils')
| -rwxr-xr-x[-rw-r--r--] | src/utils/pintos | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/utils/pintos b/src/utils/pintos index 2b5dad9..ac1c0bf 100644..100755 --- a/src/utils/pintos +++ b/src/utils/pintos @@ -472,7 +472,12 @@ sub run_qemu { if $vga eq 'terminal'; print "warning: qemu doesn't support jitter\n" if defined $jitter; - my (@cmd) = ('qemu'); + use File::Which qw(which where); + my $path = which 'qemu'; + if ($path eq "") { + $path = which 'qemu-system-i386'; + } + my (@cmd) = ($path); for my $iface (0...3) { my ($option) = ('-hda', '-hdb', '-hdc', '-hdd')[$iface]; push (@cmd, $option, $disks_by_iface[$iface]{FILE_NAME}) |