Index: trunk/packages/sipb-xen-database/client/etc/xen/sipb-database
===================================================================
--- trunk/packages/sipb-xen-database/client/etc/xen/sipb-database	(revision 670)
+++ trunk/packages/sipb-xen-database/client/etc/xen/sipb-database	(revision 671)
@@ -19,5 +19,7 @@
 machine = models.Machine.get_by(name=machine_name)
 check(machine is not None)
-machine_type = models.Type.get_by(type_id=machine.type_id)
+hvm = machine.type.hvm
+if 'cdrom_image' in locals():
+    hvm = True
 
 memory = machine.memory
@@ -33,5 +35,5 @@
 viftype = ""
 
-if machine_type.hvm:
+if hvm:
     ioemu = "ioemu:"
     viftype = "type=ioemu, "
@@ -48,7 +50,7 @@
     builder = 'linux'
 
-pae = machine_type.pae
-acpi = machine_type.acpi
-apic = machine_type.apic
+pae = machine.type.pae
+acpi = machine.type.acpi
+apic = machine.type.apic
 
 vif = []