rpms/xen/F-7 xen-clobber-vif-type.patch, NONE, 1.1 xen.spec, 1.181, 1.182

[Daniel P. Berrange (berrange)]

Author: berrange

Update of /cvs/pkgs/rpms/xen/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13981

Modified Files:
	xen.spec 
Added Files:
	xen-clobber-vif-type.patch 
Log Message:
Fix case of disappearing network card

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/F-7/xen.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- xen.spec	1 Aug 2007 13:28:48 -0000	1.181
+++ xen.spec	23 Sep 2007 16:53:56 -0000	1.182
@@ -24,6 +24,7 @@
 Patch28: xen-keyboard.patch
 Patch29: xen-3.1.0-libxc-native-protocol.patch
 Patch30: xen-3.1.0-dev-native-protocol.patch
+Patch31: xen-clobber-vif-type.patch
 
 # Patches to modify the default config of xend
 Patch100: xen-config-dom0-minmem.patch
@@ -120,6 +121,7 @@
 %patch28 -p1
 %patch29 -p1
 %patch30 -p1
+%patch31 -p1
 
 # config patches
 %patch100 -p1
@@ -268,7 +270,10 @@
 %{_libdir}/*.a
 
 %changelog
-* Wed Aug  1 2007 Markus Armbruster <armbru at redhat.com> - 3.1.0-3.fc7
+* Sun Sep 23 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-3.fc7
+- Don't clobber the VIF type attribute in FV guests (rhbz #247122)
+
+* Wed Aug  1 2007 Markus Armbruster <armbru at redhat.com>
 - Put guest's native protocol ABI into xenstore, to provide for older
   kernels running 32-on-64.
 - VNC keymap fixes