diff -r 4560fb29509f -r 8cc7466ab14c configs/example/fs.py
--- a/configs/example/fs.py	Fri Mar 08 09:19:56 2013 -0500
+++ b/configs/example/fs.py	Fri Mar 08 09:21:14 2013 -0500
@@ -71,6 +71,13 @@
 DriveCPUClass = AtomicSimpleCPU
 drive_mem_mode = 'atomic'
 
+# Check if KVM support has been enabled, we might need to do VM
+# configuration if that's the case.
+have_kvm_support = 'BaseKvmCPU' in globals()
+def is_kvm_cpu(cpu_class):
+    return have_kvm_support and cpu_class != None and \
+        issubclass(cpu_class, BaseKvmCPU)
+
 # system under test can be any CPU
 (TestCPUClass, test_mem_mode, FutureClass) = Simulation.setCPUClass(options)
 
@@ -125,6 +132,9 @@
 
 test_sys.cpu = [TestCPUClass(cpu_id=i) for i in xrange(np)]
 
+if is_kvm_cpu(TestCPUClass) or is_kvm_cpu(FutureClass):
+    test_sys.vm = KvmVM()
+
 if options.caches or options.l2cache:
     test_sys.iocache = IOCache(addr_ranges = test_sys.mem_ranges)
     test_sys.iocache.cpu_side = test_sys.iobus.master
@@ -174,6 +184,9 @@
     if options.kernel is not None:
         drive_sys.kernel = binary(options.kernel)
 
+    if is_kvm_cpu(DriveCPUClass):
+        drive_sys.vm = KvmVM()
+
     drive_sys.iobridge = Bridge(delay='50ns',
                                 ranges = drive_sys.mem_ranges)
     drive_sys.iobridge.slave = drive_sys.iobus.master