X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-xen-config.git/blobdiff_plain/36093c1510ce2b5aeb7851fca6aa5b72468889ff..22d8af42037f3b17f516817374e1eed879e16f05:/invirt-database

diff --git a/invirt-database b/invirt-database
index 095fe4d..b99b548 100644
--- a/invirt-database
+++ b/invirt-database
@@ -31,7 +31,7 @@ else:
 check(re.match('^[A-Za-z0-9][A-Za-z0-9._-]*$', machine.name))
 name = prefix + machine_name
 check(re.match('^[0-9a-f-]+$', machine.uuid))
-uuid = machine.uuid
+uuid = str(machine.uuid)
 
 vcpus = machine.cpus
 
@@ -107,8 +107,9 @@ elif cdrom is not None:
     codepath = 'hvm'
 
 if codepath == 'hvm':
+    xen_platform_pci = 1
     ioemu = "ioemu:"
-    viftype = "type=ioemu, "
+    viftype = "model=pcnet, "
     kernel = '/usr/lib/xen-4.1/boot/hvmloader'
     builder = 'hvm'
     vnc = 1
@@ -120,6 +121,8 @@ elif codepath == 'paravm':
 
 for n in machine.nics:
     check(re.match('^[0-9a-fA-F:]+$', n.mac_addr) and re.match('^[0-9.]*$', n.ip))
+    if n.nic_type:
+        viftype = viftype.replace("pcnet", n.nic_type)
     d = ('%smac=%s, ip=%s, script=vif-invirtroute netdev=%s'
          % (viftype, n.mac_addr, n.ip, config.xen.iface))
     vif.append(d)