diff options
| author | Anton S <lfxgroove@zoho.com> | 2016-05-04 15:28:36 +0200 |
|---|---|---|
| committer | Anton S <lfxgroove@zoho.com> | 2016-05-04 15:28:36 +0200 |
| commit | 0db56a417f401d4685ed1206a760731fb14c5dd5 (patch) | |
| tree | d93d783316f72e23c48cb59d450acb54431d73ab | |
| parent | a2a9484bee39f2cac6253f4d6ae3234f71107f5b (diff) | |
| download | pintos-rs-0db56a417f401d4685ed1206a760731fb14c5dd5.tar.gz | |
Add support for both qemu and qemu-system-i386 binaries in pintos
| -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}) |
