Boot VMs as HVM when there is a boot CD, regardless of machine type

svn path=/trunk/packages/sipb-xen-database/; revision=671

diff --git a/client/etc/xen/sipb-database b/client/etc/xen/sipb-database
index d9e693b..1928bba 100644 (file)
--- a/client/etc/xen/sipb-database
+++ b/client/etc/xen/sipb-database
@@ -18,7 +18,9 @@ def check(b):
 
 machine = models.Machine.get_by(name=machine_name)
 check(machine is not None)
 
 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
 maxmem = memory
 
 memory = machine.memory
 maxmem = memory

@@ -32,7 +34,7 @@ vcpus = machine.cpus
 diskioemu = ""
 viftype = ""
 
 diskioemu = ""
 viftype = ""
 

-if machine_type.hvm:
+if hvm:

     ioemu = "ioemu:"
     viftype = "type=ioemu, "
 
     ioemu = "ioemu:"
     viftype = "type=ioemu, "
 

@@ -47,9 +49,9 @@ else:
     ramdisk = '/boot/initrd.img-2.6.18-5-xen-amd64'
     builder = 'linux'
 
     ramdisk = '/boot/initrd.img-2.6.18-5-xen-amd64'
     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 = []
 
 
 vif = []