[Xen-changelog] [xen-unstable] Merge

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Tim Deegan <Tim.Deegan@xxxxxxxxxxxxx>
# Date 1170240261 0
# Node ID d653e4bcead040524d16b4b507db1d0481a9e6b3
# Parent  9130206e27f8a5dacaea350ebbd895b14c9b09e2
# Parent  c834e3984baa231d32689e74ddd8ce8850b682ce
Merge
---
 tools/Rules.mk              |   12 ++++++------
 tools/blktap/Makefile       |    4 ++--
 tools/security/Makefile     |    3 +--
 tools/xenfb/Makefile        |    2 +-
 xen/arch/x86/domain_build.c |    2 +-
 5 files changed, 11 insertions(+), 12 deletions(-)

diff -r 9130206e27f8 -r d653e4bcead0 tools/Rules.mk
--- a/tools/Rules.mk    Wed Jan 31 10:28:47 2007 +0000
+++ b/tools/Rules.mk    Wed Jan 31 10:44:21 2007 +0000
@@ -32,7 +32,7 @@ CFLAGS += $(CFLAGS-y)
 %.o: %.cc
        $(CC) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
 
-.PHONY: mk-symlinks mk-symlinks-xen mk-symlinks-$(XEN_OS) mk-foreign-headers
+.PHONY: mk-symlinks mk-symlinks-xen mk-symlinks-$(XEN_OS)
 
 mk-symlinks-SunOS:
 
@@ -43,7 +43,7 @@ mk-symlinks-Linux:
          ln -sf ../../$(LINUX_ROOT)/include/xen/public/*.h . )
        ( cd xen && rm -f sys && ln -sf linux sys )
 
-mk-symlinks-xen: mk-foreign-headers
+mk-symlinks-xen:
        mkdir -p xen
        ( cd xen && ln -sf ../$(XEN_ROOT)/xen/include/public/*.h . )
        mkdir -p xen/hvm
@@ -53,9 +53,9 @@ mk-symlinks-xen: mk-foreign-headers
        mkdir -p xen/arch-x86
        ( cd xen/arch-x86 && ln -sf 
../../$(XEN_ROOT)/xen/include/public/arch-x86/*.h . )
        mkdir -p xen/foreign
-       ( cd xen/foreign && ln -sf 
../../$(XEN_ROOT)/xen/include/public/foreign/*.h . )
-
-mk-foreign-headers:
-       make -C $(XEN_ROOT)/xen/include/public/foreign
+       ( cd xen/foreign && ln -sf 
../../$(XEN_ROOT)/xen/include/public/foreign/Makefile . )
+       ( cd xen/foreign && ln -sf 
../../$(XEN_ROOT)/xen/include/public/foreign/reference.size . )
+       ( cd xen/foreign && ln -sf 
../../$(XEN_ROOT)/xen/include/public/foreign/*.py . )
+       make -C xen/foreign
 
 mk-symlinks: mk-symlinks-xen mk-symlinks-$(XEN_OS)
diff -r 9130206e27f8 -r d653e4bcead0 tools/blktap/Makefile
--- a/tools/blktap/Makefile     Wed Jan 31 10:28:47 2007 +0000
+++ b/tools/blktap/Makefile     Wed Jan 31 10:44:21 2007 +0000
@@ -9,7 +9,7 @@ all: build
 all: build
 
 .PHONY: build
-build: mk-symlinks
+build:
        @set -e; for subdir in $(SUBDIRS-y); do \
        $(MAKE) -C $$subdir all;       \
                done
@@ -22,7 +22,7 @@ install:
 
 .PHONY: clean
 clean:
-       rm -rf *.a *.so *.o *.rpm $(LIB) *~ $(DEPS) xen TAGS
+       rm -rf *.a *.so *.o *.rpm $(LIB) *~ $(DEPS) TAGS
        @set -e; for subdir in $(SUBDIRS-y); do \
        $(MAKE) -C $$subdir clean;       \
                done
diff -r 9130206e27f8 -r d653e4bcead0 tools/security/Makefile
--- a/tools/security/Makefile   Wed Jan 31 10:28:47 2007 +0000
+++ b/tools/security/Makefile   Wed Jan 31 10:44:21 2007 +0000
@@ -86,7 +86,7 @@ endif
 endif
 
 .PHONY: build
-build: mk-symlinks $(ACM_INST_TOOLS) $(ACM_NOINST_TOOLS)
+build: $(ACM_INST_TOOLS) $(ACM_NOINST_TOOLS)
        python python/setup.py build
        chmod 700 $(ACM_SCRIPTS)
 
@@ -104,7 +104,6 @@ clean:
        $(RM) $(ACM_INST_TOOLS) $(ACM_NOINST_TOOLS)
        $(RM) $(ACM_OBJS)
        $(RM) $(PROG_DEPS)
-       $(RM) -r xen
        $(RM) -r build
 
 .PHONY: mrproper
diff -r 9130206e27f8 -r d653e4bcead0 tools/xenfb/Makefile
--- a/tools/xenfb/Makefile      Wed Jan 31 10:28:47 2007 +0000
+++ b/tools/xenfb/Makefile      Wed Jan 31 10:44:21 2007 +0000
@@ -12,7 +12,7 @@ all: build
 all: build
 
 .PHONY: build
-build: mk-symlinks
+build:
        $(MAKE) vncfb sdlfb
 
 install: all
diff -r 9130206e27f8 -r d653e4bcead0 xen/arch/x86/domain_build.c
--- a/xen/arch/x86/domain_build.c       Wed Jan 31 10:28:47 2007 +0000
+++ b/xen/arch/x86/domain_build.c       Wed Jan 31 10:44:21 2007 +0000
@@ -871,7 +871,7 @@ int construct_dom0(struct domain *d,
 
     memset(si->cmd_line, 0, sizeof(si->cmd_line));
     if ( cmdline != NULL )
-        safe_strcpy(si->cmd_line, cmdline);
+        strlcpy((char *)si->cmd_line, cmdline, sizeof(si->cmd_line));
 
     if ( fill_console_start_info((void *)(si + 1)) )
     {

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog