[Xen-changelog] Manual merge -- hg not so good at deleting right now.

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

# HG changeset patch
# User akw27@xxxxxxxxxxxxxxxxxxxxxx
# Node ID 09067ce923038c4ba6dcb9630fb848cce0d1c5fa
# Parent  abbc1d071e22967f0445de795c05c327b2dce888

# Parent  f075272620a0aa0d768e9f82baf97d3581a118a0
Manual merge -- hg not so good at deleting right now.
Signed-off-by: akw27@xxxxxxxxx

diff -r abbc1d071e22 -r 09067ce92303 xen/common/kernel.c
--- a/xen/common/kernel.c       Sun Jul  3 14:14:09 2005
+++ b/xen/common/kernel.c       Sun Jul  3 18:49:55 2005
@@ -92,7 +92,7 @@
 
     case XENVER_extraversion:
     {
-        char extraversion[16];
+        xen_extraversion_t extraversion;
         safe_strcpy(extraversion, XEN_EXTRAVERSION);
         if ( copy_to_user(arg, extraversion, sizeof(extraversion)) )
             return -EFAULT;
diff -r abbc1d071e22 -r 09067ce92303 xen/include/public/version.h
--- a/xen/include/public/version.h      Sun Jul  3 14:14:09 2005
+++ b/xen/include/public/version.h      Sun Jul  3 18:49:55 2005
@@ -15,10 +15,11 @@
 /* arg == NULL; returns major:minor (16:16). */
 #define XENVER_version      0
 
-/* arg == 16-char string buffer. */
+/* arg == xen_extraversion_t. */
 #define XENVER_extraversion 1
+typedef char xen_extraversion_t[16];
 
-/* arg == xenversion_compile_info_t. */
+/* arg == xen_compile_info_t. */
 #define XENVER_compile_info 2
 typedef struct xen_compile_info {
     char compiler[64];
diff -r abbc1d071e22 -r 09067ce92303 tools/ioemu/target-i386-dm/Makefile
--- a/tools/ioemu/target-i386-dm/Makefile       Sun Jul  3 14:14:09 2005
+++ b/tools/ioemu/target-i386-dm/Makefile       Sun Jul  3 18:49:55 2005
@@ -384,9 +384,8 @@
 install: all 
        if [ ! -d $(INSTALL_DIR) ];then mkdir -p $(INSTALL_DIR);fi
        if [ ! -d $(DESTDIR)$(configdir) ];then mkdir -p 
$(DESTDIR)$(configdir);fi
-ifneq ($(PROGS),)
        install -m 755 -s $(PROGS) "$(INSTALL_DIR)"
-endif
+       install -m 755 -s qemu-dm.debug "$(INSTALL_DIR)"
        install -m 755 qemu-ifup "$(DESTDIR)$(configdir)"
        gunzip -c qemu-vgaram-bin.gz >qemu-vgaram-bin 
        install -m 755 qemu-vgaram-bin "$(DESTDIR)$(configdir)"

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