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 f6dfe44f428bd51e59bf6528e935191ca82c87b9..410b3336437b99f7e2f5e25b403c7ae4c225549f 100644 (file)
--- 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 4b385cdf87553a07f1d5c1a2667a260b145a416c..1abd2edc6a9055ae37788867dc022110d8310ea2 100755 (executable)
--- 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];