rpms/xen/devel sources, 1.14, 1.15 xen-misc-fixes.patch, 1.13, 1.14 xen.spec, 1.32, 1.33

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Apr 1 03:38:42 UTC 2005


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

Modified Files:
	sources xen-misc-fixes.patch xen.spec 
Log Message:
- upgrade to new xen hypervisor
- minor gcc4 compile fix



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	28 Mar 2005 21:15:25 -0000	1.14
+++ sources	1 Apr 2005 03:38:40 -0000	1.15
@@ -1 +1 @@
-d8f0f4f8e20cf106974ef4e1496416e5  xen-unstable-src.tgz
+cdde283ce0937d6c80b7cbf994c4e216  xen-unstable-src.tgz

xen-misc-fixes.patch:
 libxutil/iostream.h |   12 ++++++------
 xfrd/xen_domain.c   |    3 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)

Index: xen-misc-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/xen-misc-fixes.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xen-misc-fixes.patch	28 Mar 2005 21:15:25 -0000	1.13
+++ xen-misc-fixes.patch	1 Apr 2005 03:38:40 -0000	1.14
@@ -54,75 +54,15 @@
    }
    *stream = (IOStream){};
    deallocate(stream);
-
-cc1: warnings being treated as errors
-xc_ptrace.c: In function 'xc_ptrace':
-xc_ptrace.c:252: warning: pointer targets in assignment differ in signedness
-make[4]: *** [xc_ptrace.opic] Error 1
-
---- xen-unstable/tools/libxc/xc_ptrace.c.sign	2005-03-17 11:16:57.000000000 -0500
-+++ xen-unstable/tools/libxc/xc_ptrace.c	2005-03-17 11:18:01.000000000 -0500
-@@ -249,7 +249,7 @@ xc_ptrace(enum __ptrace_request request,
-     case PTRACE_PEEKDATA:
-     case PTRACE_POKETEXT:
-     case PTRACE_POKEDATA:
--	if ((guest_va = (unsigned long *)map_domain_va(pid, addr)) == NULL) {
-+	if ((guest_va = (long *)map_domain_va(pid, addr)) == NULL) {
- 	    status = EFAULT;
- 	    goto done;
- 	}
-@@ -257,7 +257,7 @@ xc_ptrace(enum __ptrace_request request,
- 	if (request == PTRACE_PEEKTEXT || request == PTRACE_PEEKDATA)
- 	    retval = *guest_va;
- 	else
--	    *guest_va = (unsigned long)data;
-+	    *guest_va = (long)data;
- 	break;
-     case PTRACE_GETREGS:
-     case PTRACE_GETFPREGS:
---- xen-unstable/xen/Makefile.tags	2005-03-28 15:11:00.000000000 -0500
-+++ xen-unstable/xen/Makefile	2005-03-28 15:11:25.000000000 -0500
-@@ -103,7 +103,7 @@ include/asm-$(TARGET_ARCH)/asm-offsets.h
- 	  echo ""; \
- 	  echo "#endif") <$< >$@
- 
--.PHONY: default debug install dist clean delete-unfresh-files TAGS
-+.PHONY: default debug install dist clean delete-unfresh-files TAGS tags
- 
- SUBDIRS = arch common drivers 
- TAGS: 
-@@ -111,5 +111,10 @@ TAGS: 
- 	  find include -type d \( -name "asm-*" -o -name config \) -prune -o \
- 		-name '*.h' -print; \
- 	  find $(SUBDIRS) -name '*.[chS]' ) | grep -v /SCCS/ | etags -
-+tags: 
-+	( find include/asm-$(TARGET_ARCH) -name '*.h'; \
-+	  find include -type d \( -name "asm-*" -o -name config \) -prune -o \
-+		-name '*.h' -print; \
-+	  find $(SUBDIRS) -name '*.[chS]' ) | grep -v /SCCS/ | xargs ctags
- MAP:
- 	nm $(TARGET) | grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | sort > System.map
-For unknown reasons, this bug doesn't show up when Xen is compiled
-with gcc-3.4, so I was off on a wild goose chase for a few days.
-With this barrier added, the system boots fine again.
-
-Note that we should probably move barrier into cpu_relax, but that's
-a story for another patch.
-
-Signed-off-by: Rik van Riel <riel at redhat.com>
-
---- xen-unstable/xen/arch/x86/smpboot.c.barrier	2005-03-28 15:17:11.000000000 -0500
-+++ xen-unstable/xen/arch/x86/smpboot.c	2005-03-28 15:32:30.000000000 -0500
-@@ -413,8 +413,10 @@ void __init start_secondary(void)
- 
-     smp_callin();
- 
--    while (!atomic_read(&smp_commenced))
--        rep_nop();
-+    while (!atomic_read(&smp_commenced)) {
-+        cpu_relax();
-+        barrier();
-+    }
- 
- #ifdef __i386__
-     /*
+--- 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){
+  */
+ int curldebug(CURL *curl, curl_infotype ty, char *buf, size_t buf_n, void *data){
+     // printf("%*s\n", buf_n, buf); /* Does not compile correctly on non 32bit platforms */
+-    fwrite(data, buf_n, 1, stdout);
++    int err;
++    err = fwrite(data, buf_n, 1, stdout);
+     printf("\n");
+     return 0;
+ }


Index: xen.spec
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- xen.spec	29 Mar 2005 14:53:26 -0000	1.32
+++ xen.spec	1 Apr 2005 03:38:40 -0000	1.33
@@ -3,7 +3,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 2
-Release: 20050328
+Release: 20050331
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.sourceforge.net/projects/xen/
@@ -33,7 +33,7 @@
 
 %prep
 %setup -q -n xen-unstable
-%patch1 -p1
+# %patch1 -p1
 %patch2 -p1
 
 %build
@@ -91,6 +91,10 @@
 %{_sysconfdir}/%{name}*
 
 %changelog
+* Thu Mar 31 2005 Rik van Riel <riel at redhat.com> 2-20050331
+- upgrade to new xen hypervisor
+- minor gcc4 compile fix
+
 * Mon Mar 28 2005 Rik van Riel <riel at redhat.com> 2-20050328
 - do not yet upgrade to new hypervisor ;)
 - add barrier to fix SMP boot bug




More information about the fedora-cvs-commits mailing list