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

diff --git a/invirt-database b/invirt-database
index 095fe4d..ec611c1 100644
--- a/invirt-database
+++ b/invirt-database
@@ -107,8 +107,10 @@ 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
     ioemu = "ioemu:"
-    viftype = "type=ioemu, "
+    viftype = "type=ioemu,model=pcnet, "
     kernel = '/usr/lib/xen-4.1/boot/hvmloader'
     builder = 'hvm'
     vnc = 1
@@ -120,6 +122,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)