rpms/xen/devel sources, 1.13, 1.14 xen-misc-fixes.patch, 1.12, 1.13 xen.spec, 1.28, 1.29
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Mar 28 21:15:28 UTC 2005
Update of /cvs/dist/rpms/xen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22789
Modified Files:
sources xen-misc-fixes.patch xen.spec
Log Message:
- do not yet upgrade to new hypervisor ;)
- add barrier to fix SMP boot bug
- add tags target
- add zlib-devel build requires (#150952)
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 9 Mar 2005 22:33:00 -0000 1.13
+++ sources 28 Mar 2005 21:15:25 -0000 1.14
@@ -1 +1 @@
-3ecc3638fa843b057b13f6d28e3843c7 xen-unstable-src.tgz
+d8f0f4f8e20cf106974ef4e1496416e5 xen-unstable-src.tgz
xen-misc-fixes.patch:
tools/libxc/xc_ptrace.c | 4 ++--
tools/libxutil/iostream.h | 12 ++++++------
xen/Makefile | 7 ++++++-
xen/arch/x86/smpboot.c | 6 ++++--
4 files changed, 18 insertions(+), 11 deletions(-)
Index: xen-misc-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/xen-misc-fixes.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xen-misc-fixes.patch 9 Mar 2005 23:33:53 -0000 1.12
+++ xen-misc-fixes.patch 28 Mar 2005 21:15:25 -0000 1.13
@@ -1,20 +1,3 @@
-grant_table.c: In function 'do_grant_table_op':
-grant_table.c:348: warning: 'va' may be used uninitialized in this function
-make[3]: *** [grant_table.o] Error 1
-
-Signed-off-by: Rik van Riel <riel at redhat.com>
-
---- xen-unstable/xen/common/grant_table.c.orig 2005-03-09 15:48:16.000000000 -0500
-+++ xen-unstable/xen/common/grant_table.c 2005-03-09 16:57:38.000000000 -0500
-@@ -345,7 +345,7 @@
- gnttab_map_grant_ref_t *uop, unsigned int count)
- {
- int i, flush = 0;
-- unsigned long va;
-+ unsigned long va = 0;
-
- for ( i = 0; i < count; i++ )
- if ( __gnttab_map_grant_ref(&uop[i], &va) == 0)
--- 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
@@ -71,3 +54,75 @@
}
*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__
+ /*
Index: xen.spec
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- xen.spec 9 Mar 2005 22:33:00 -0000 1.28
+++ xen.spec 28 Mar 2005 21:15:25 -0000 1.29
@@ -3,7 +3,7 @@
Summary: Xen is a virtual machine monitor
Name: xen
Version: 2
-Release: 20050308
+Release: 20050328
Group: Development/Libraries
License: GPL
URL: http://www.sourceforge.net/projects/xen/
@@ -12,7 +12,7 @@
Patch1: xen-install-nocheck.patch
Patch2: xen-misc-fixes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: transfig libidn-devel
+BuildRequires: transfig libidn-devel zlib-devel
BuildRequires: xorg-x11-devel python-devel
Requires: bridge-utils python-twisted
Requires: python-abi = %{pyver}
@@ -88,6 +88,12 @@
%{_sysconfdir}/%{name}*
%changelog
+* 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
+- add tags target
+- add zlib-devel build requires (#150952)
+
* Wed Mar 9 2005 Rik van Riel <riel at redhat.com> 2-20050308
- upgrade to last night's snapshot
- new compile fix patch
More information about the fedora-cvs-commits
mailing list