Index: arch/ia32/src/smp/apic.c
===================================================================
--- arch/ia32/src/smp/apic.c	(revision 9b2729c3ad8e7aff76bee8e6c6439ae01d9ab7f7)
+++ arch/ia32/src/smp/apic.c	(revision 8b3eebbb09010358cfc788bbaa6c70640d3306b7)
@@ -48,4 +48,5 @@
  *	Simics 2.0.28 - Simics 2.2.19 2-15 CPUs
  *	VMware Workstation 5.5 with 2 CPUs
+ *	QEMU 0.8.0 with 2-15 CPUs
  *	ASUS P/I-P65UP5 + ASUS C-P55T2D REV. 1.41 with 2x 200Mhz Pentium CPUs
  *	ASUS PCH-DL with 2x 3000Mhz Pentium 4 Xeon (HT) CPUs
Index: arch/mips32/src/mips32.c
===================================================================
--- arch/mips32/src/mips32.c	(revision 9b2729c3ad8e7aff76bee8e6c6439ae01d9ab7f7)
+++ arch/mips32/src/mips32.c	(revision 8b3eebbb09010358cfc788bbaa6c70640d3306b7)
@@ -116,5 +116,5 @@
 /* TODO: How do we do it on SMP system???? */
 
-/* Why the hell moves the linker the variable 64K away in assembler
+/* Why the linker moves the variable 64K away in assembler
  * when not in .text section ????????
  */
Index: contrib/conf/dot.bochsrc
===================================================================
--- contrib/conf/dot.bochsrc	(revision 9b2729c3ad8e7aff76bee8e6c6439ae01d9ab7f7)
+++ contrib/conf/dot.bochsrc	(revision 8b3eebbb09010358cfc788bbaa6c70640d3306b7)
@@ -59,4 +59,6 @@
 display_library: x 
 
+cpu: count=8, ips=10000000
+
 #=======================================================================
 # ROMIMAGE:
@@ -67,8 +69,7 @@
 # location of the BIOS.
 #=======================================================================
-#romimage: file=$BXSHARE/BIOS-bochs-latest, address=0xf0000
-#romimage: file=bios/BIOS-bochs-2-processors, address=0xf0000
-romimage: file=$BXSHARE/BIOS-bochs-8-processors, address=0xf0000
-#romimage: file=bios/rombios.bin, address=0xf0000
+romimage: file=$BXSHARE/BIOS-bochs-latest, address=0xf0000
+#romimage: file=$BXSHARE/BIOS-bochs-8-processors, address=0xf0000
+#romimage: file=bios/P4SMT, address=0xf0000
 
 #=======================================================================
@@ -346,5 +347,5 @@
 # if you disable it you may get a spectacular disaster instead.
 #=======================================================================
-panic: action=ask
+panic: action=report
 error: action=report
 info: action=report
Index: doc/arch/amd64
===================================================================
--- doc/arch/amd64	(revision 9b2729c3ad8e7aff76bee8e6c6439ae01d9ab7f7)
+++ doc/arch/amd64	(revision 8b3eebbb09010358cfc788bbaa6c70640d3306b7)
@@ -19,8 +19,11 @@
                 o 2x-8x AMD64 CPU
         o Simics 2.2.19
-                o 2x-8x AMD hammer CPU
+                o 2x-15x AMD hammer CPU
+	o QEMU 0.8.0
+		o 2x-15x CPU
 	o HP ProLiant ML350 (HyperThreading)
 
 EMULATORS AND VIRTUALIZERS
-        o Bochs 2.2.5
+        o Bochs 2.2.6
         o Simics 2.2.19
+	o QEMU 0.8.0
Index: doc/arch/ia32
===================================================================
--- doc/arch/ia32	(revision 9b2729c3ad8e7aff76bee8e6c6439ae01d9ab7f7)
+++ doc/arch/ia32	(revision 8b3eebbb09010358cfc788bbaa6c70640d3306b7)
@@ -23,4 +23,6 @@
 	o VMware Workstation 5.5
 		o 2x CPU
+	o QEMU 0.8.0
+		o 2x-15x CPU
         o ASUS P/I-P65UP5 + ASUS C-P55T2D REV. 1.41
                 o 2x 200Mhz Pentium CPU
@@ -31,5 +33,6 @@
 
 EMULATORS AND VIRTUALIZERS
-        o Bochs 2.0.2 - Bochs 2.2.5
+        o Bochs 2.0.2 - Bochs 2.2.6
         o VMware Workstation 4, VMware Workstation 5, VMware Workstation 5.5
         o Simics 2.2.19
+	o QEMU 0.8.0