Capitalize QEMU properly.

From chris@seberino.org.

diff --git a/doc/installation.texi b/doc/installation.texi
index 5e35e8b2e0f82240715b09b39a37bec42633baf0..f513a746134336fca132e91db2bd096163c8210e 100644 (file)
--- a/doc/installation.texi
+++ b/doc/installation.texi
@@ -40,8 +40,8 @@ Required: @uref{http://www.gnu.org/software/make/, GNU make}, version
 3.80 or later.
 
 @item
 3.80 or later.
 
 @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
+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

 slowness is frustrating.
 
 @item
 slowness is frustrating.
 
 @item

diff --git a/doc/intro.texi b/doc/intro.texi
index 47ba0569d3b0b7b5e16a2ed85f1f0c4b60cb3c07..afa067d86a659ba7e828bd6664702a25925cc22f 100644 (file)
--- a/doc/intro.texi
+++ b/doc/intro.texi
@@ -16,7 +16,7 @@ CPU and its peripheral devices accurately enough that unmodified operating
 systems and software can run under it.  In class we will use the
 @uref{http://bochs.sourceforge.net, , Bochs} and 
 @uref{http://fabrice.bellard.free.fr/qemu/, ,
 systems and software can run under it.  In class we will use the
 @uref{http://bochs.sourceforge.net, , Bochs} and 
 @uref{http://fabrice.bellard.free.fr/qemu/, ,

-qemu} simulators.  Pintos has also been tested with
+QEMU} simulators.  Pintos has also been tested with

 @uref{http://www.vmware.com/, , VMware Player}.
 
 These projects are hard.  CS 140 has a reputation of taking a lot of
 @uref{http://www.vmware.com/, , VMware Player}.
 
 These projects are hard.  CS 140 has a reputation of taking a lot of


@@ -250,7 +250,7 @@ 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
 @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

-@option{--qemu} selects qemu.  You can run the simulator
+@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
 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


@@ -308,9 +308,9 @@ 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.
 
 second of real time.  Simulation in real-time mode is not reproducible,
 and options @option{-j} and @option{-r} are mutually exclusive.
 

-The qemu simulator is available as an
+The QEMU simulator is available as an

 alternative to Bochs (use @option{--qemu} when invoking
 alternative to Bochs (use @option{--qemu} when invoking

-@command{pintos}).  The qemu simulator is much faster than Bochs, but it
+@command{pintos}).  The QEMU simulator is much faster than Bochs, but it

 only supports real-time simulation and does not have a reproducible
 mode.
 
 only supports real-time simulation and does not have a reproducible
 mode.
 


@@ -338,7 +338,7 @@ After running all the tests, @command{make check} also prints a summary
 of the test results.
 
 For project 1, the tests will probably run faster in Bochs.  For the
 of the test results.
 
 For project 1, the tests will probably run faster in Bochs.  For the

-rest of the projects, they will run much faster in qemu.
+rest of the projects, they will run much faster in QEMU.

 @command{make check} will select the faster simulator by default, but
 you can override its choice by specifying @option{SIMULATOR=--bochs} or
 @option{SIMULATOR=--qemu} on the @command{make} command line.
 @command{make check} will select the faster simulator by default, but
 you can override its choice by specifying @option{SIMULATOR=--bochs} or
 @option{SIMULATOR=--qemu} on the @command{make} command line.

diff --git a/src/devices/serial.c b/src/devices/serial.c
index 92b00ef06eaa67513be6858101f41358b54bb291..f4d0de8114a6818d51730aadedfd116b1570cb40 100644 (file)
--- a/src/devices/serial.c
+++ b/src/devices/serial.c
@@ -206,7 +206,7 @@ static void
 serial_interrupt (struct intr_frame *f UNUSED) 
 {
   /* Inquire about interrupt in UART.  Without this, we can
 serial_interrupt (struct intr_frame *f UNUSED) 
 {
   /* Inquire about interrupt in UART.  Without this, we can

-     occasionally miss an interrupt running under qemu. */
+     occasionally miss an interrupt running under QEMU. */

   inb (IIR_REG);
 
   /* As long as we have room to receive a byte, and the hardware
   inb (IIR_REG);
 
   /* As long as we have room to receive a byte, and the hardware

diff --git a/src/threads/init.c b/src/threads/init.c
index c8889f10abbe6af8b1bca6c8874adadb045678f8..458f67cb2bbd7a7424950d8a219c9f08747c30f8 100644 (file)
--- a/src/threads/init.c
+++ b/src/threads/init.c
@@ -367,7 +367,7 @@ usage (void)
 
 
 /* Powers down the machine we're running on,
 
 
 /* Powers down the machine we're running on,

-   as long as we're running on Bochs or qemu. */
+   as long as we're running on Bochs or QEMU. */

 void
 power_off (void) 
 {
 void
 power_off (void) 
 {


@@ -385,6 +385,8 @@ power_off (void)
 
   for (p = s; *p != '\0'; p++)
     outb (0x8900, *p);
 
   for (p = s; *p != '\0'; p++)
     outb (0x8900, *p);

+  asm ("cli; hlt");
+  printf ("still running...\n");

   for (;;);
 }
 
   for (;;);
 }
 

diff --git a/src/utils/pintos b/src/utils/pintos
index 9de9f9a0c28be0560e1c63b056cd2aec93df302b..0d7b8bca2476fa7946ccf288dcabdfeb089e4ac6 100755 (executable)
--- a/src/utils/pintos
+++ b/src/utils/pintos
@@ -108,7 +108,7 @@ where each OPTION is one of the following options
   and each ARGUMENT is passed to Pintos kernel verbatim.
 Simulator selection:
   --bochs                  (default) Use Bochs as simulator
   and each ARGUMENT is passed to Pintos kernel verbatim.
 Simulator selection:
   --bochs                  (default) Use Bochs as simulator

-  --qemu                   Use qemu as simulator
+  --qemu                   Use QEMU as simulator

   --player                 Use VMware Player as simulator
 Debugger selection:
   --no-debug               (default) No debugger
   --player                 Use VMware Player as simulator
 Debugger selection:
   --no-debug               (default) No debugger


@@ -454,7 +454,7 @@ sub print_bochs_disk_line {
     }
 }
 
     }
 }
 

-# Runs qemu.
+# Runs QEMU.

 sub run_qemu {
     print "warning: qemu doesn't support --terminal\n"
       if $vga eq 'terminal';
 sub run_qemu {
     print "warning: qemu doesn't support --terminal\n"
       if $vga eq 'terminal';


@@ -707,7 +707,7 @@ sub run_command {
 # Relays common signals to the subprocess.
 # If $timeout is set then the subprocess will be killed after that long.
 sub xsystem {
 # Relays common signals to the subprocess.
 # If $timeout is set then the subprocess will be killed after that long.
 sub xsystem {

-    # qemu turns off local echo and does not restore it if killed by a signal.
+    # QEMU turns off local echo and does not restore it if killed by a signal.

     # We compensate by restoring it ourselves.
     my $cleanup = sub {};
     if (isatty (0)) {
     # We compensate by restoring it ourselves.
     my $cleanup = sub {};
     if (isatty (0)) {