X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/eb9adb539fb47ab4b5c4e859cf119b554b9116cb..1d079163df57b9ba8d4f19fa1b80c07c46f3b2ef:/code/controls.py

diff --git a/code/controls.py b/code/controls.py
index b2c60d5..14ba689 100644
--- a/code/controls.py
+++ b/code/controls.py
@@ -99,7 +99,7 @@ def unregisterMachine(machine):
     """Unregister a machine to not be controlled by the web interface"""
     remctl('web', 'unregister', machine.name)
 
-def createVm(owner, contact, name, memory, disk_size, is_hvm, cdrom, clone_from):
+def createVm(owner, contact, name, memory, disk_size, machine_type, cdrom, clone_from):
     """Create a VM and put it in the database"""
     # put stuff in the table
     transaction = ctx.current.create_transaction()
@@ -119,7 +119,6 @@ def createVm(owner, contact, name, memory, disk_size, is_hvm, cdrom, clone_from)
         machine.contact = contact
         machine.uuid = uuidToString(randomUUID())
         machine.boot_off_cd = True
-        machine_type = Type.get_by(hvm=is_hvm)
         machine.type_id = machine_type.type_id
         ctx.current.save(machine)
         disk = Disk(machine_id=machine.machine_id, 
@@ -127,7 +126,7 @@ def createVm(owner, contact, name, memory, disk_size, is_hvm, cdrom, clone_from)
         open_nics = NIC.select_by(machine_id=None)
         if not open_nics: #No IPs left!
             raise CodeError("No IP addresses left!  "
-                            "Contact sipb-xen-dev@mit.edu")
+                            "Contact sipb-xen@mit.edu.")
         nic = open_nics[0]
         nic.machine_id = machine.machine_id
         nic.hostname = name