ia64/xen-unstable

changeset 5654:09067ce92303

Manual merge -- hg not so good at deleting right now.
Signed-off-by: akw27@cam.ac.uk
author akw27@arcadians.cl.cam.ac.uk
date Sun Jul 03 18:49:55 2005 +0000 (2005-07-03)
parents abbc1d071e22 f075272620a0
children f8acd354e129
files tools/blktap/Makefile tools/ioemu/target-i386-dm/Makefile xen/common/kernel.c xen/include/public/version.h
line diff
     2.1 --- a/tools/ioemu/target-i386-dm/Makefile	Sun Jul 03 14:14:09 2005 +0000
     2.2 +++ b/tools/ioemu/target-i386-dm/Makefile	Sun Jul 03 18:49:55 2005 +0000
     2.3 @@ -384,9 +384,8 @@ distclean:
     2.4  install: all 
     2.5  	if [ ! -d $(INSTALL_DIR) ];then mkdir -p $(INSTALL_DIR);fi
     2.6  	if [ ! -d $(DESTDIR)$(configdir) ];then mkdir -p $(DESTDIR)$(configdir);fi
     2.7 -ifneq ($(PROGS),)
     2.8  	install -m 755 -s $(PROGS) "$(INSTALL_DIR)"
     2.9 -endif
    2.10 +	install -m 755 -s qemu-dm.debug "$(INSTALL_DIR)"
    2.11  	install -m 755 qemu-ifup "$(DESTDIR)$(configdir)"
    2.12  	gunzip -c qemu-vgaram-bin.gz >qemu-vgaram-bin 
    2.13  	install -m 755 qemu-vgaram-bin "$(DESTDIR)$(configdir)"
     3.1 --- a/xen/common/kernel.c	Sun Jul 03 14:14:09 2005 +0000
     3.2 +++ b/xen/common/kernel.c	Sun Jul 03 18:49:55 2005 +0000
     3.3 @@ -92,7 +92,7 @@ long do_xen_version(int cmd, void *arg)
     3.4  
     3.5      case XENVER_extraversion:
     3.6      {
     3.7 -        char extraversion[16];
     3.8 +        xen_extraversion_t extraversion;
     3.9          safe_strcpy(extraversion, XEN_EXTRAVERSION);
    3.10          if ( copy_to_user(arg, extraversion, sizeof(extraversion)) )
    3.11              return -EFAULT;
     4.1 --- a/xen/include/public/version.h	Sun Jul 03 14:14:09 2005 +0000
     4.2 +++ b/xen/include/public/version.h	Sun Jul 03 18:49:55 2005 +0000
     4.3 @@ -15,10 +15,11 @@
     4.4  /* arg == NULL; returns major:minor (16:16). */
     4.5  #define XENVER_version      0
     4.6  
     4.7 -/* arg == 16-char string buffer. */
     4.8 +/* arg == xen_extraversion_t. */
     4.9  #define XENVER_extraversion 1
    4.10 +typedef char xen_extraversion_t[16];
    4.11  
    4.12 -/* arg == xenversion_compile_info_t. */
    4.13 +/* arg == xen_compile_info_t. */
    4.14  #define XENVER_compile_info 2
    4.15  typedef struct xen_compile_info {
    4.16      char compiler[64];