diff -r dc0e14c27718 -r 2dc38d8e0e68 configs/common/Simulation.py
--- a/configs/common/Simulation.py	Sat Dec 24 20:22:27 2011 -0600
+++ b/configs/common/Simulation.py	Sun Dec 25 10:52:23 2011 -0600
@@ -119,7 +119,6 @@
             if options.maxinsts:
                 switch_cpus[i].max_insts_any_thread = options.maxinsts
 
-        testsys.switch_cpus = switch_cpus
         switch_cpu_list = [(testsys.cpu[i], switch_cpus[i]) for i in xrange(np)]
 
     if options.standard_switch:
diff -r dc0e14c27718 -r 2dc38d8e0e68 src/dev/io_device.cc
--- a/src/dev/io_device.cc	Sat Dec 24 20:22:27 2011 -0600
+++ b/src/dev/io_device.cc	Sun Dec 25 10:52:23 2011 -0600
@@ -71,7 +71,7 @@
 PioDevice::init()
 {
     if (!pioPort)
-        panic("Pio port not connected to anything!");
+        panic("Pio port of %s not connected to anything!", name());
     pioPort->sendStatusChange(Port::RangeChange);
 }