rpms/xen/FC-5 xen-no-Werror-for-blktap.patch, NONE, 1.1 xen-noblktap.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 sources, 1.32, 1.33 xen-network-iptables-bridge.patch, 1.1, 1.2 xen-vmxballoon-hack.patch, 1.2, 1.3 xen.spec, 1.114, 1.115

Wed Sep 20 21:17:59 UTC 2006

Author: quintela

Update of /cvs/dist/rpms/xen/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv32356

Modified Files:
	.cvsignore sources xen-network-iptables-bridge.patch 
	xen-vmxballoon-hack.patch xen.spec 
Added Files:
	xen-no-Werror-for-blktap.patch xen-noblktap.patch 
Log Message:
xen update to cset 1540

xen-no-Werror-for-blktap.patch:
 Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xen-no-Werror-for-blktap.patch ---
diff -up -urNp xen-unstable.hg/tools/blktap/drivers/Makefile xen-unstable.work/tools/blktap/drivers/Makefile
--- xen-unstable.hg/tools/blktap/drivers/Makefile	2006-09-20 21:00:15.000000000 +0200
+++ xen-unstable.work/tools/blktap/drivers/Makefile	2006-09-20 22:39:13.000000000 +0200
@@ -12,7 +12,7 @@ LIBAIO_DIR   = ../../libaio/src
 
 CFLAGS   += -fPIC
 CFLAGS   += -Wall
-CFLAGS   += -Werror
+CFLAGS   +=
 CFLAGS   += -Wno-unused
 CFLAGS   += -g3
 CFLAGS   += -fno-strict-aliasing

xen-noblktap.patch:
 xend |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE xen-noblktap.patch ---
--- xen-unstable-10712/tools/misc/xend.noblktap	2006-07-28 12:52:00.000000000 -0400
+++ xen-unstable-10712/tools/misc/xend	2006-07-28 12:52:16.000000000 -0400
@@ -110,19 +110,19 @@
     elif sys.argv[1] == 'start':
         start_xenstored()
         start_consoled()
-	start_blktapctrl()
+#	start_blktapctrl()
         return daemon.start()
     elif sys.argv[1] == 'trace_start':
         start_xenstored()
         start_consoled()
-        start_blktapctrl()
+#        start_blktapctrl()
         return daemon.start(trace=1)
     elif sys.argv[1] == 'stop':
         return daemon.stop()
     elif sys.argv[1] == 'restart':
         start_xenstored()
         start_consoled()
-        start_blktapctrl()
+#        start_blktapctrl()
         return daemon.stop() or daemon.start()
     elif sys.argv[1] == 'status':
         return daemon.status()


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xen/FC-5/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	20 Jun 2006 22:07:17 -0000	1.17
+++ .cvsignore	20 Sep 2006 21:17:57 -0000	1.18
@@ -1,2 +1,2 @@
 LibVNCServer-0.7.1.tar.gz
-xen-unstable-10278.tar.bz2
+xen-unstable-11540.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xen/FC-5/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	20 Jun 2006 22:07:17 -0000	1.32
+++ sources	20 Sep 2006 21:17:57 -0000	1.33
@@ -1,2 +1,2 @@
 54110288b3171551c03467cd60976d55  LibVNCServer-0.7.1.tar.gz
-3a9ceecf483dad0a29364b73b445636c  xen-unstable-10278.tar.bz2
+acbead3d3040fb8b5b06ba635186954d  xen-unstable-11540.tar.bz2

xen-network-iptables-bridge.patch:
 xen-network-common.sh |    3 +++
 1 files changed, 3 insertions(+)

Index: xen-network-iptables-bridge.patch
===================================================================
RCS file: /cvs/dist/rpms/xen/FC-5/xen-network-iptables-bridge.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-network-iptables-bridge.patch	2 Feb 2006 22:24:14 -0000	1.1
+++ xen-network-iptables-bridge.patch	20 Sep 2006 21:17:57 -0000	1.2
@@ -1,12 +1,12 @@
---- xen-3.0.0/tools/examples/network-bridge.foo	2006-02-02 17:18:41.000000000 -0500
-+++ xen-3.0.0/tools/examples/network-bridge	2006-02-02 17:18:56.000000000 -0500
-@@ -158,6 +158,9 @@
- 
-     # Don't create the bridge if it already exists.
-     if ! brctl show | grep -q ${bridge} ; then
-+	sysctl -w "net.bridge.bridge-nf-call-arptables=0"
-+	sysctl -w "net.bridge.bridge-nf-call-ip6tables=0"
-+	sysctl -w "net.bridge.bridge-nf-call-iptables=0"
+--- xen-unstable.hg/tools/examples/xen-network-common.sh.network-iptables-bridge	2006-07-19 09:45:57.000000000 -0400
++++ xen-unstable.hg/tools/examples/xen-network-common.sh	2006-07-19 09:46:18.000000000 -0400
+@@ -130,6 +130,9 @@
  	brctl addbr ${bridge}
  	brctl stp ${bridge} off
  	brctl setfd ${bridge} 0
++	sysctl -w "net.bridge.bridge-nf-call-arptables=0"
++	sysctl -w "net.bridge.bridge-nf-call-ip6tables=0"
++	sysctl -w "net.bridge.bridge-nf-call-iptables=0"
+         ip link set ${bridge} arp off
+         ip link set ${bridge} multicast off
+     fi

xen-vmxballoon-hack.patch:
 XendDomainInfo.py |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletion(-)

Index: xen-vmxballoon-hack.patch
===================================================================
RCS file: /cvs/dist/rpms/xen/FC-5/xen-vmxballoon-hack.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xen-vmxballoon-hack.patch	8 Feb 2006 21:18:36 -0000	1.2
+++ xen-vmxballoon-hack.patch	20 Sep 2006 21:17:57 -0000	1.3
@@ -1,7 +1,7 @@
---- xen-3.0.0/tools/python/xen/xend/XendDomainInfo.py.vmxballoon	2006-02-07 17:45:12.000000000 -0500
-+++ xen-3.0.0/tools/python/xen/xend/XendDomainInfo.py	2006-02-07 17:44:50.000000000 -0500
-@@ -1182,7 +1182,13 @@
-                     xc.vcpu_setaffinity(self.domid, v, cpu)
+--- xen-unstable.hg/tools/python/xen/xend/XendDomainInfo.py.~1~	2006-07-13 15:51:46.000000000 +0100
++++ xen-unstable.hg/tools/python/xen/xend/XendDomainInfo.py	2006-07-13 15:56:15.000000000 +0100
+@@ -1281,7 +1281,13 @@
+             xc.domain_setmaxmem(self.domid, self.info['maxmem'] * 1024)
  
              m = self.image.getDomainMemory(self.info['memory'] * 1024)
 -            balloon.free(m)
@@ -12,6 +12,6 @@
 +            if self.image.ostype == "hvm":
 +                fudge = 1026 * 4 # 1 meg of video ram + pt
 +            balloon.free(m + fudge)
-             xc.domain_setmaxmem(self.domid, m)
-             xc.domain_memory_increase_reservation(self.domid, m, 0, 0)
  
+             init_reservation = self.info['memory'] * 1024
+             if os.uname()[4] == 'ia64':


Index: xen.spec
===================================================================
RCS file: /cvs/dist/rpms/xen/FC-5/xen.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- xen.spec	21 Jun 2006 14:45:24 -0000	1.114
+++ xen.spec	20 Sep 2006 21:17:57 -0000	1.115
@@ -5,19 +5,19 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.0.2
-Release: 3.FC5
+Release: 4.FC5
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
-Source0: xen-unstable-10278.tar.bz2
+Source0: xen-unstable-11540.tar.bz2
 Source1: http://download.sf.net/libvncserver/LibVNCServer-%{libvncver}.tar.gz
 Source2: xenguest-install.py
 Source3: xen-udev.rules
 Patch1: xen-initscript.patch
 Patch6: xen-network-iptables-bridge.patch
 Patch8: xen-vmxballoon-hack.patch
-Patch11: xen-3.0.1-cloexec.patch
-Patch12: xen-3.0.1-tempdir.patch
+Patch13: xen-noblktap.patch
+Patch14: xen-no-Werror-for-blktap.patch
 
 # Patches to modify the default config of xend
 Patch100: xen-config-dom0-minmem.patch
@@ -59,9 +59,9 @@
 %setup -q -n xen-unstable.hg -a 1
 %patch1 -p1 -b .init
 %patch6 -p1
-%patch8 -p1
-#patch11 -p1 -b .cloexec
-%patch12 -p1 -b .tempdir
+#%patch8 -p1
+%patch13 -p1 -b .blktap
+%patch14 -p1 -b .Werror
 
 # config patches
 %patch100 -p1
@@ -165,6 +165,9 @@
 %dir %{_localstatedir}/run/xenstored
 
 %changelog
+* Wed Sep 20 2006 Juan Quintela <quintela at redhat.com> - 3.0.2-4.FC5
+- Update to xen-unstable cset: 11540.
+
 * Wed Jun 21 2006 Daniel Veillard <veillard at redhat.com> - 3.0.2-3.FC5
 - Add missing xen-compat.h needed to compile on the new xen sources
 


