From 0db56a417f401d4685ed1206a760731fb14c5dd5 Mon Sep 17 00:00:00 2001
From: Anton S <lfxgroove@zoho.com>
Date: Wed, 4 May 2016 15:28:36 +0200
Subject: Add support for both qemu and qemu-system-i386 binaries in pintos

---
 src/utils/pintos | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 src/utils/pintos

(limited to 'src')

diff --git a/src/utils/pintos b/src/utils/pintos
old mode 100644
new mode 100755
index 2b5dad9..ac1c0bf
--- 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})
-- 
cgit v1.2.1