Index: contrib/conf/simics.conf
===================================================================
--- contrib/conf/simics.conf	(revision 6bf18fa28bef60dc097c0cb12740c66da26513f1)
+++ contrib/conf/simics.conf	(revision 8cf8ee6454a588b78b0423f5af6cffa91031b4f4)
@@ -13,11 +13,13 @@
 @if not "memory_megs"             in dir(): memory_megs = 256
 
-@if not "floppy_image"            in dir(): floppy_image = "image.boot"
+@if not "cdrom_image"             in dir(): cdrom_image = "image.iso"
 @if not "use_voodoo3_pci"         in dir(): use_voodoo3_pci = 1
 @if not "use_voodoo3_agp"         in dir(): use_voodoo3_agp = 0
-@if not "boot_dev"                in dir(): boot_dev = "A"
 
 run-command-file ../x86-test-machine/pc-common.simics
+run-python-file ../scripts/cdrom_bootloader.py
 
-@if floppy_image != None:
-	eval_cli_line("flp0.insert-floppy A %s" % floppy_image)
+@install_cdrom_bootloader((conf.cpu0,))
+@if cdrom_image != None:
+	eval_cli_line("new-file-cdrom %s image" % cdrom_image)
+	eval_cli_line("cd0.insert image")