From: Ben Pfaff <blp@cs.stanford.edu>
Date: Thu, 7 Jan 2010 06:12:36 +0000 (-0800)
Subject: Support newer versions of QEMU, which do not have the -no-kqemu option.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pintos-anon;a=commitdiff_plain;h=12d423a1973d59006cd7ffbf8b71cd7409d04703;ds=sidebyside

Support newer versions of QEMU, which do not have the -no-kqemu option.

Thanks to David Mazieres for reporting the problem and the fix.
---

diff --git a/doc/installation.texi b/doc/installation.texi
index f6dfe44..410b333 100644
--- a/doc/installation.texi
+++ b/doc/installation.texi
@@ -41,7 +41,7 @@ Required: @uref{http://www.gnu.org/software/make/, GNU make}, version
 
 @item
 Recommended: @uref{http://fabrice.bellard.free.fr/qemu/, QEMU}, version
-0.8.0 or later.  If QEMU is not available, Bochs can be used, but its
+0.11.0 or later.  If QEMU is not available, Bochs can be used, but its
 slowness is frustrating.
 
 @item
diff --git a/src/utils/pintos b/src/utils/pintos
index 4b385cd..1abd2ed 100755
--- a/src/utils/pintos
+++ b/src/utils/pintos
@@ -619,7 +619,6 @@ sub run_qemu {
     print "warning: qemu doesn't support jitter\n"
       if defined $jitter;
     my (@cmd) = ('qemu');
-    push (@cmd, '-no-kqemu');
     push (@cmd, '-hda', $disks[0]) if defined $disks[0];
     push (@cmd, '-hdb', $disks[1]) if defined $disks[1];
     push (@cmd, '-hdc', $disks[2]) if defined $disks[2];