X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-xen-config.git/blobdiff_plain/8c35d5e3d5dd87c100aff61a7806816ba462ab26..ba2cbfd952ad6ef034730d81f7c79c71c7d674d9:/invirt-database?ds=sidebyside

diff --git a/invirt-database b/invirt-database
index 5fa24e2..bf1509f 100644
--- a/invirt-database
+++ b/invirt-database
@@ -107,10 +107,9 @@ elif cdrom is not None:
     codepath = 'hvm'
 
 if codepath == 'hvm':
-    # Disable PVHVM for now until we figure out the best way to do this
-    xen_platform_pci = 0
+    xen_platform_pci = 1
     ioemu = "ioemu:"
-    viftype = "type=ioemu,model=pcnet, "
+    viftype = "model=pcnet, "
     kernel = '/usr/lib/xen-4.1/boot/hvmloader'
     builder = 'hvm'
     vnc = 1
@@ -122,7 +121,7 @@ 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.model:
+    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))