X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-database.git/blobdiff_plain/1d2313f85d8f35e6cf6ad019d0f411066d491c59..b0de0658bb284ed8a7f21b9fe5d9303f006b65cc:/client/etc/xen/sipb-database diff --git a/client/etc/xen/sipb-database b/client/etc/xen/sipb-database index fa75ebc..1928bba 100644 --- 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_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 @@ -32,7 +34,7 @@ vcpus = machine.cpus diskioemu = "" viftype = "" -if machine_type.hvm: +if hvm: ioemu = "ioemu:" viftype = "type=ioemu, " @@ -41,14 +43,15 @@ if machine_type.hvm: vnc = 1 vncpasswd = 'moocow' device_model = '/usr/sbin/qemu-dm-sipb' + serial = 'pty' else: - kernel = '/boot/vmlinuz-2.6.18-4-xen-amd64' - ramdisk = '/boot/initrd.img-2.6.18-4-xen-amd64' + kernel = '/boot/vmlinuz-2.6.18-5-xen-amd64' + 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 = [] @@ -82,6 +85,8 @@ elif 'cdrom_image' in locals(): disk.append('file:/srv/images/' + cdrom_image + '.iso,hdc:cdrom,r') boot = 'd' +usbdevice = 'tablet' + on_poweroff = 'destroy' on_reboot = 'restart' on_crash = 'destroy'