rpms/xen/devel xen-clobber-vif-type.patch, NONE, 1.1 xen.spec, 1.183, 1.184

[Daniel P. Berrange (berrange)]

Author: berrange

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10226

Modified Files:
	xen.spec 
Added Files:
	xen-clobber-vif-type.patch 
Log Message:
Fix VIF type attribute handling
Resolves: rhbz #296061

xen-clobber-vif-type.patch:

--- NEW FILE xen-clobber-vif-type.patch ---
diff -rup xen-3.1.0-src.orig/tools/python/xen/xend/server/netif.py xen-3.1.0-src.new/tools/python/xen/xend/server/netif.py
--- xen-3.1.0-src.orig/tools/python/xen/xend/server/netif.py	2007-09-19 14:24:34.000000000 -0400
+++ xen-3.1.0-src.new/tools/python/xen/xend/server/netif.py	2007-09-19 14:25:28.000000000 -0400
@@ -108,17 +108,15 @@ class NetifController(DevController):
         ipaddr  = config.get('ip')
         model   = config.get('model')
 
-        if not typ:
-            typ = xoptions.netback_type
-
         if not mac:
             mac = randomMAC()
 
         devid = self.allocateDeviceID()
 
         back = { 'script' : script,
-                 'mac'    : mac,
-                 'type'   : typ }
+                 'mac'    : mac }
+        if typ:
+            back['type'] = typ
         if ipaddr:
             back['ip'] = ipaddr
         if bridge:


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- xen.spec	28 Aug 2007 23:16:53 -0000	1.183
+++ xen.spec	19 Sep 2007 20:26:16 -0000	1.184
@@ -3,7 +3,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.1.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -27,6 +27,7 @@
 Patch29: xen-3.1.0-libxc-native-protocol.patch
 Patch30: xen-3.1.0-dev-native-protocol.patch
 Patch31: xen-tpm-functions.patch
+Patch32: xen-clobber-vif-type.patch
 
 # Patches to modify the default config of xend
 Patch100: xen-config-dom0-minmem.patch
@@ -129,6 +130,7 @@
 %patch30 -p1
 
 %patch31 -p1
+%patch32 -p1
 
 # config patches
 %patch100 -p1
@@ -279,6 +281,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Wed Sep 19 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-6.fc8
+- Don't clobber the VIF type attribute in FV guests (rhbz #296061)
+
 * Tue Aug 28 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-5.fc8
 - Added dep on openssl for blktap-qcow