rpms/xen/devel sources, 1.15, 1.16 xen-misc-fixes.patch, 1.15, 1.16 xen.spec, 1.38, 1.39 xen-man-path.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: riel

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

Modified Files:
	sources xen-misc-fixes.patch xen.spec 
Removed Files:
	xen-man-path.patch 
Log Message:
upgrade to last night's snapshot


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	1 Apr 2005 03:38:40 -0000	1.15
+++ sources	25 Apr 2005 13:52:16 -0000	1.16
@@ -1 +1 @@
-cdde283ce0937d6c80b7cbf994c4e216  xen-unstable-src.tgz
+425a87af78cc9ec01b04095c99bd0c90  xen-unstable-src.tgz

xen-misc-fixes.patch:
 xen_domain.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

Index: xen-misc-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/xen-misc-fixes.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xen-misc-fixes.patch	3 Apr 2005 16:31:22 -0000	1.15
+++ xen-misc-fixes.patch	25 Apr 2005 13:52:16 -0000	1.16
@@ -1,59 +1,3 @@
---- xen-unstable/tools/libxutil/iostream.h.gcc4	2005-03-09 18:23:48.000000000 -0500
-+++ xen-unstable/tools/libxutil/iostream.h	2005-03-09 18:25:28.000000000 -0500
-@@ -111,7 +111,7 @@ static inline int IOStream_read(IOStream
-         result = -EINVAL;
-         goto exit;
-     }
--    result = stream->methods->read(stream, buf, n);
-+    result = (stream->methods->read)(stream, buf, n);
-     if(result > 0){
-         stream->read += result;
-     }
-@@ -133,7 +133,7 @@ static inline int IOStream_write(IOStrea
-         result = -EINVAL;
-         goto exit;
-     }
--    result = stream->methods->write(stream, buf, n);
-+    result = (stream->methods->write)(stream, buf, n);
-     if(result > 0){
-         stream->written += result;
-     }
-@@ -151,7 +151,7 @@ static inline int IOStream_flush(IOStrea
-     if(stream->closed){
-         result = IOSTREAM_EOF;
-     } else if(stream->methods->flush){
--        result = stream->methods->flush(stream);
-+        result = (stream->methods->flush)(stream);
-         if(result < 0) result = IOSTREAM_EOF;
-     }
-     return result;
-@@ -165,7 +165,7 @@ static inline int IOStream_flush(IOStrea
- static inline int IOStream_error(IOStream *stream){
-     int err = 0;
-     if(stream->methods && stream->methods->error){
--       err = stream->methods->error(stream);
-+       err = (stream->methods->error)(stream);
-     }
-     return err;
- }
-@@ -178,7 +178,7 @@ static inline int IOStream_error(IOStrea
- static inline int IOStream_close(IOStream *stream){
-     int err = 1;
-     if(stream->methods && stream->methods->close){
--        err = stream->methods->close(stream);
-+        err = (stream->methods->close)(stream);
-     }
-     return err;
- }
-@@ -198,7 +198,7 @@ static inline int IOStream_is_closed(IOS
-  */
- static inline void IOStream_free(IOStream *stream){
-   if(stream->methods && stream->methods->free){
--    stream->methods->free(stream);
-+    (stream->methods->free)(stream);
-   }
-   *stream = (IOStream){};
-   deallocate(stream);
 --- xen-unstable/tools/xfrd/xen_domain.c.gcc4	2005-03-31 22:28:53.000000000 -0500
 +++ xen-unstable/tools/xfrd/xen_domain.c	2005-03-31 22:29:04.000000000 -0500
 @@ -178,7 +178,8 @@ static CURL *curlinit(void){
@@ -66,24 +10,3 @@
      printf("\n");
      return 0;
  }
---- xen-unstable/xen/arch/x86/domain.c.smp	2005-04-03 12:16:12.000000000 -0400
-+++ xen-unstable/xen/arch/x86/domain.c	2005-04-03 12:17:59.000000000 -0400
-@@ -802,12 +802,15 @@ static void __context_switch(void)
- #endif
-     }
- 
--    set_bit(cpu, &n->domain->cpuset);
--    write_ptbase(n);
--    clear_bit(cpu, &p->domain->cpuset);
-+    if ( p->domain != n->domain )
-+       set_bit(cpu, &n->domain->cpuset);
- 
-+    write_ptbase(n);
-     __asm__ __volatile__ ( "lgdt %0" : "=m" (*n->arch.gdt) );
- 
-+    if ( p->domain != n->domain )
-+       clear_bit(cpu, &p->domain->cpuset);
-+
-     percpu_ctxt[cpu].curr_ed = n;
- }
- 


Index: xen.spec
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- xen.spec	15 Apr 2005 20:58:54 -0000	1.38
+++ xen.spec	25 Apr 2005 13:52:16 -0000	1.39
@@ -3,13 +3,12 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 2
-Release: 20050403
+Release: 20050424
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
 Source0: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/xen-unstable-src.tgz
 Patch0: xen-misc-fixes.patch
-Patch1: xen-man-path.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: transfig libidn-devel zlib-devel
 BuildRequires: xorg-x11-devel python-devel ghostscript tetex-latex
@@ -34,7 +33,6 @@
 %prep
 %setup -q -n xen-unstable
 %patch0 -p1
-%patch1 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__make} XEN_PYTHON_NATIVE_INSTALL=1 xen tools docs 
@@ -72,6 +70,10 @@
 %{_bindir}/xencons
 %{_bindir}/xentrace
 %{_bindir}/xentrace_format
+%{_bindir}/cpuperf-perfcntr
+%{_bindir}/cpuperf-xen
+%{_bindir}/xc_shadow
+
 %{_includedir}/*.h
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/*
@@ -87,6 +89,9 @@
 %{_sysconfdir}/%{name}*
 
 %changelog
+* Mon Apr 25 2005 Rik van Riel <riel at redhat.com> 2-20050424
+- upgrade to last night's snapshot
+
 * Fri Apr 15 2005 Jeremy Katz <katzj at redhat.com>
 - patch manpath instead of moving in specfile.  patch sent upstream
 - install to native python path instead of /usr/lib/python


--- xen-man-path.patch DELETED ---