X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-xen-config.git/blobdiff_plain/18f0d4c89f941272c8da5eb3d0ee19cafbca49ac..bffb8c5bde4ab1b8911e77271ce3dca2829d2633:/invirt-database

diff --git a/invirt-database b/invirt-database
index 9350316..936c2a7 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
 
@@ -95,7 +95,7 @@ if 'installer_options' in locals(): #Installer
         n = machine.nics[0]
         extra = 'ro noresume'
         extra += (' ip=%s::%s:%s:%s:eth0:off'
-                  % (n.ip, config.dhcp.gateway, config.dhcp.netmask, machine.name))
+                  % (n.ip, n.gateway, n.netmask, machine.name))
         extra += ' %s' % installer_options
         root = '/dev/hdb1'
     codepath = None
@@ -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,8 +121,12 @@ 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))
-    d = ('%smac=%s, ip=%s, script=vif-invirtroute netdev=%s'
-         % (viftype, n.mac_addr, n.ip, config.xen.iface))
+    if n.nic_type:
+        viftype = viftype.replace("pcnet", n.nic_type)
+    other_netparams = ('other_ip=%s other_gateway=%s'
+                      % (n.other_ip, n.other_gateway) if n.other_ip else '')
+    d = ('%smac=%s, ip=%s, script=vif-invirtroute netdev=%s gateway=%s %s'
+         % (viftype, n.mac_addr, n.ip, config.xen.iface, n.gateway, other_netparams))
     vif.append(d)
 
 for d in machine.disks: