From: Nelson Elhage <nelhage@mit.edu>
Date: Sat, 22 Sep 2007 17:19:16 +0000 (-0400)
Subject: Fix the vif generation for non-hvms
X-Git-Tag: sipb-xen-database/6~1
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-database.git/commitdiff_plain/aeb7de658cdbd0007fcfb485d9dd0d5fe87586e4

Fix the vif generation for non-hvms

svn path=/trunk/packages/sipb-xen-database/sipb-xen-database/; revision=101
---

diff --git a/client/etc/xen/sipb-database b/client/etc/xen/sipb-database
index daccd93..94ae6cc 100644
--- a/client/etc/xen/sipb-database
+++ b/client/etc/xen/sipb-database
@@ -1,3 +1,4 @@
+# -*- mode: python; -*-
 import sipb_xen_database.models as models
 from sipb_xen_database import connect
 
@@ -19,7 +20,7 @@ viftype = ""
 
 if machine_type.hvm:
     ioemu = "ioemu:"
-    viftype = "type=ioemu"
+    viftype = "type=ioemu, "
 
     kernel = 'hvmloader'
     builder = 'hvm'
@@ -37,7 +38,7 @@ apic = machine_type.apic
 vif = []
 
 for n in machine.nics:
-    d = '%s, mac=%s, ip=%s, bridge=xenbr0, script=vif-sipbroute' % (viftype, n.mac_addr, n.ip)
+    d = '%smac=%s, ip=%s, bridge=xenbr0, script=vif-sipbroute' % (viftype, n.mac_addr, n.ip)
     vif.append(d)
 
 disk = []