ia64/xen-unstable

changeset 4545:189085197f6d

find changesets by author, revision, files, or words in the commit message
bitkeeper revision 1.1306 (42604119SDlzs7R1nEPCLSovtVOJ7A)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
author iap10@freefall.cl.cam.ac.uk
date Fri Apr 15 22:32:57 2005 +0000 (2005-04-15)
parents 3dac50183187 4099062dbee6
children 73ef7f1fc714
files BitKeeper/etc/logging_ok linux-2.6.11-xen-sparse/include/asm-xen/evtchn.h tools/misc/netfix tools/misc/xend tools/misc/xensv tools/misc/xm tools/xentrace/Makefile xen/Makefile
line diff
     2.1 --- a/linux-2.6.11-xen-sparse/include/asm-xen/evtchn.h	Fri Apr 15 22:28:14 2005 +0000
     2.2 +++ b/linux-2.6.11-xen-sparse/include/asm-xen/evtchn.h	Fri Apr 15 22:32:57 2005 +0000
     2.3 @@ -80,12 +80,12 @@ static inline void clear_evtchn(int port
     2.4      synch_clear_bit(port, &s->evtchn_pending[0]);
     2.5  }
     2.6  
     2.7 -static inline void notify_via_evtchn(int port)
     2.8 +static inline int notify_via_evtchn(int port)
     2.9  {
    2.10      evtchn_op_t op;
    2.11      op.cmd = EVTCHNOP_send;
    2.12      op.u.send.local_port = port;
    2.13 -    (void)HYPERVISOR_event_channel_op(&op);
    2.14 +    return HYPERVISOR_event_channel_op(&op);
    2.15  }
    2.16  
    2.17  /*

     3.1 --- a/tools/misc/netfix	Fri Apr 15 22:28:14 2005 +0000
     3.2 +++ b/tools/misc/netfix	Fri Apr 15 22:32:57 2005 +0000
     3.3 @@ -9,8 +9,8 @@
     3.4  
     3.5  from getopt import getopt
     3.6  
     3.7 -# Default install path for Xen binary packages.
     3.8 -sys.path = [ '/usr/lib/python' ] + sys.path
     3.9 +# add fallback path for non-native python path installs if needed
    3.10 +sys.path.append('/usr/lib/python')
    3.11  from xen.util.Brctl import *
    3.12  
    3.13  short_options = 'hvqni:b:c'

     4.1 --- a/tools/misc/xend	Fri Apr 15 22:28:14 2005 +0000
     4.2 +++ b/tools/misc/xend	Fri Apr 15 22:32:57 2005 +0000
     4.3 @@ -30,8 +30,8 @@ XCS_EXEC    = "/usr/sbin/xcs"
     4.4  XCS_PIDFILE = "/var/run/xcs.pid"
     4.5  XCS_ARGS    = (XCS_EXEC, "-p", XCS_PIDFILE)
     4.6  
     4.7 -# Default install path for Xen binary packages.
     4.8 -sys.path = [ '/usr/lib/python' ] + sys.path
     4.9 +# add fallback path for non-native python path installs if needed
    4.10 +sys.path.append('/usr/lib/python')
    4.11  from xen.xend.server import SrvDaemon
    4.12  
    4.13  class CheckError(ValueError):

     5.1 --- a/tools/misc/xensv	Fri Apr 15 22:28:14 2005 +0000
     5.2 +++ b/tools/misc/xensv	Fri Apr 15 22:32:57 2005 +0000
     5.3 @@ -22,8 +22,8 @@ import os
     5.4  import sys
     5.5  import re
     5.6  
     5.7 -# Default install path for Xen binary packages.
     5.8 -sys.path = [ '/usr/lib/python' ] + sys.path
     5.9 +# add fallback path for non-native python path installs if needed
    5.10 +sys.path.append('/usr/lib/python')
    5.11  from xen.xend.server.params import XEND_PID_FILE
    5.12  
    5.13  class CheckError(ValueError):

     6.1 --- a/tools/misc/xm	Fri Apr 15 22:28:14 2005 +0000
     6.2 +++ b/tools/misc/xm	Fri Apr 15 22:32:57 2005 +0000
     6.3 @@ -2,8 +2,8 @@
     6.4  #  -*- mode: python; -*-
     6.5  import sys
     6.6  
     6.7 -# Default install path for Xen binary packages.
     6.8 -sys.path = [ '/usr/lib/python' ] + sys.path
     6.9 +# add fallback path for non-native python path installs if needed
    6.10 +sys.path.append('/usr/lib/python')
    6.11  from xen.xm import main
    6.12  
    6.13  main.main(sys.argv)

     7.1 --- a/tools/xentrace/Makefile	Fri Apr 15 22:28:14 2005 +0000
     7.2 +++ b/tools/xentrace/Makefile	Fri Apr 15 22:32:57 2005 +0000
     7.3 @@ -25,13 +25,13 @@ build: $(BIN)
     7.4  
     7.5  install: build
     7.6  	[ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin
     7.7 -	[ -d $(DESTDIR)/usr/man/man1 ] || \
     7.8 -		$(INSTALL_DIR) $(DESTDIR)/usr/man/man1
     7.9 -	[ -d $(DESTDIR)/usr/man/man8 ] || \
    7.10 -		$(INSTALL_DIR) $(DESTDIR)/usr/man/man8
    7.11 +	[ -d $(DESTDIR)/usr/share/man/man1 ] || \
    7.12 +		$(INSTALL_DIR) $(DESTDIR)/usr/share/man/man1
    7.13 +	[ -d $(DESTDIR)/usr/share/man/man8 ] || \
    7.14 +		$(INSTALL_DIR) $(DESTDIR)/usr/share/man/man8
    7.15  	$(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)/usr/bin
    7.16 -	$(INSTALL_DATA) $(MAN1) $(DESTDIR)/usr/man/man1
    7.17 -	$(INSTALL_DATA) $(MAN8) $(DESTDIR)/usr/man/man8
    7.18 +	$(INSTALL_DATA) $(MAN1) $(DESTDIR)/usr/share/man/man1
    7.19 +	$(INSTALL_DATA) $(MAN8) $(DESTDIR)/usr/share/man/man8
    7.20  
    7.21  clean:
    7.22  	$(RM) *.a *.so *.o *.rpm $(BIN)

     8.1 --- a/xen/Makefile	Fri Apr 15 22:28:14 2005 +0000
     8.2 +++ b/xen/Makefile	Fri Apr 15 22:32:57 2005 +0000
     8.3 @@ -27,7 +27,7 @@ debug:
     8.4  dist: install
     8.5  
     8.6  build: $(TARGET).gz
     8.7 -	
     8.8 +
     8.9  install: $(TARGET).gz
    8.10  	[ -d $(DESTDIR)/boot ] || $(INSTALL_DIR) $(DESTDIR)/boot
    8.11  	$(INSTALL_DATA) $(TARGET).gz $(DESTDIR)/boot