Now that qemu is available on Solaris, don't talk about it being

Linux-only.

diff --git a/doc/filesys.texi b/doc/filesys.texi
index 7f4bd5c268e1a824abe77e229571c860586dcb51..1f10143cfaf9030a977df98e7bb71cae6306acf0 100644 (file)
--- a/doc/filesys.texi
+++ b/doc/filesys.texi
@@ -14,6 +14,10 @@ filesys submission.  If you build on project 3, then all of the project
 @file{filesys/Make.vars} to enable VM functionality.  You can receive up
 to 5% extra credit if you do enable VM.
 
+The tests for project 4 (and later projects) will probably run faster if
+you use the qemu emulator, e.g.@: via @code{make check
+PINTOSOPTS='--qemu'}.
+
 @menu
 * Project 4 Background::        
 * Project 4 Requirements::      

diff --git a/doc/intro.texi b/doc/intro.texi
index 4a517f20a649efb27ab2c3ea1ae4e2736d805036..f563dac817fbf9628081a84efb36f999dea060c3 100644 (file)
--- a/doc/intro.texi
+++ b/doc/intro.texi
@@ -248,8 +248,8 @@ must precede the commands passed to the Pintos kernel and be separated
 from them by @option{--}, so that the whole command looks like
 @code{pintos @var{option}@dots{} -- @var{argument}@dots{}}.  Invoke
 @code{pintos} without any arguments to see a list of available options.
-Options can select a simulator to use: the default is Bochs, but on the
-Linux machines @option{--qemu} selects qemu.  You can run the simulator
+Options can select a simulator to use: the default is Bochs, but
+@option{--qemu} selects qemu.  You can run the simulator
 with a debugger (@pxref{GDB}).  You can set the amount of memory to give
 the VM.  Finally, you can select how you want VM output to be displayed:
 use @option{-v} to turn off the VGA display, @option{-t} to use your
@@ -307,7 +307,7 @@ timings, in which a one-second delay should take approximately one
 second of real time.  Simulation in real-time mode is not reproducible,
 and options @option{-j} and @option{-r} are mutually exclusive.
 
-On the Linux machines only, the qemu simulator is available as an
+The qemu simulator is available as an
 alternative to Bochs (use @option{--qemu} when invoking
 @command{pintos}).  The qemu simulator is much faster than Bochs, but it
 only supports real-time simulation and does not have a reproducible

diff --git a/doc/userprog.texi b/doc/userprog.texi
index 655c5be8691dcb0bf6e167283c7b9c427de02c76..8ed52b1e6aca46b28c40c9d4a962ee95ee28f7d5 100644 (file)
--- a/doc/userprog.texi
+++ b/doc/userprog.texi
@@ -20,10 +20,9 @@ assignment.  The ``alarm clock'' functionality may be useful in
 projects 3 and 4, but it is not strictly required.
 
 You might find it useful to go back and reread how to run the tests
-(@pxref{Testing}).  In particular, the tests for project 2 and later
-projects will probably run faster if you use the qemu emulator, e.g.@:
-via @code{make check PINTOSOPTS='--qemu'}.  The qemu emulator is
-available only on the Linux machines.
+(@pxref{Testing}).  In particular, the tests for project 2 (and later
+projects) will probably run faster if you use the qemu emulator, e.g.@:
+via @code{make check PINTOSOPTS='--qemu'}.
 
 @menu
 * Project 2 Background::        

diff --git a/doc/vm.texi b/doc/vm.texi
index de9010519e6dfd97713f93f441db49f89508d3ab..0ea3ee9eba50ded50c97b8a5aa9a5e2fedc0e4ed 100644 (file)
--- a/doc/vm.texi
+++ b/doc/vm.texi
@@ -17,6 +17,10 @@ in project 3.
 You will continue to handle Pintos disks and file systems the same way
 you did in the previous assignment (@pxref{Using the File System}).
 
+The tests for project 3 (and later projects) will probably run faster if
+you use the qemu emulator, e.g.@: via @code{make check
+PINTOSOPTS='--qemu'}.
+
 @menu
 * Project 3 Background::        
 * Project 3 Suggested Order of Implementation::