direct-io.hg

changeset 3420:9a92e168d231

bitkeeper revision 1.1159.217.9 (41e4ea41-PFvthJ_X2r27xBL8jEH1g)

Fix tools compilation.
author kaf24@scramble.cl.cam.ac.uk
date Wed Jan 12 09:13:37 2005 +0000 (2005-01-12)
parents f687ff7239d5
children f43ba601eca1
files BitKeeper/etc/ignore tools/ioemu/Makefile tools/ioemu/gui/Makefile tools/ioemu/iodev/Makefile tools/ioemu/memory/Makefile tools/ioemu/memory/misc_mem.cc tools/libxc/xc.h tools/libxc/xc_linux_save.c
line diff
     1.1 --- a/BitKeeper/etc/ignore	Tue Jan 11 22:34:41 2005 +0000
     1.2 +++ b/BitKeeper/etc/ignore	Wed Jan 12 09:13:37 2005 +0000
     1.3 @@ -20,29 +20,9 @@ docs/*.log
     1.4  docs/*.pdf
     1.5  docs/*.ps
     1.6  docs/*.toc
     1.7 -docs/figs/xenserver.eps
     1.8  docs/html/*
     1.9 -docs/interface/WARNINGS
    1.10 -docs/interface/images.pl
    1.11 -docs/interface/images.tex
    1.12 -docs/interface/img1.png
    1.13 -docs/interface/index.html
    1.14 -docs/interface/interface.css
    1.15 -docs/interface/interface.html
    1.16 -docs/interface/labels.pl
    1.17  docs/pdf/*
    1.18  docs/ps/*
    1.19 -docs/user/WARNINGS
    1.20 -docs/user/images.pl
    1.21 -docs/user/images.tex
    1.22 -docs/user/img1.png
    1.23 -docs/user/img2.png
    1.24 -docs/user/img3.png
    1.25 -docs/user/index.html
    1.26 -docs/user/internals.pl
    1.27 -docs/user/labels.pl
    1.28 -docs/user/user.css
    1.29 -docs/user/user.html
    1.30  extras/mini-os/h/hypervisor-ifs
    1.31  install/*
    1.32  linux-*-xen0/*
    1.33 @@ -61,6 +41,7 @@ pristine-*
    1.34  tools/*/build/lib*/*.py
    1.35  tools/balloon/balloon
    1.36  tools/check/.*
    1.37 +tools/ioemu/iodev/device-model
    1.38  tools/libxc/xen/*
    1.39  tools/misc/miniterm/miniterm
    1.40  tools/misc/xen_cpuperf
     2.1 --- a/tools/ioemu/Makefile	Tue Jan 11 22:34:41 2005 +0000
     2.2 +++ b/tools/ioemu/Makefile	Wed Jan 12 09:13:37 2005 +0000
     2.3 @@ -1,12 +1,12 @@
     2.4  # Order is important!
     2.5  SUBDIRS=gui memory iodev
     2.6  
     2.7 -all: $(SUBDIRS)
     2.8 +.PHONY: all clean install
     2.9  
    2.10 -$(SUBDIRS):
    2.11 -	$(MAKE) -C $@
    2.12 -
    2.13 -.PHONY: all $(SUBDIRS)
    2.14 +all:
    2.15 +	@for subdir in $(SUBDIRS); do 				\
    2.16 +		$(MAKE) -C $$subdir $(MAKEDEFS) $@ || exit -1; 	\
    2.17 +	done
    2.18  
    2.19  clean:
    2.20  	@for subdir in $(SUBDIRS); do 				\
     3.1 --- a/tools/ioemu/gui/Makefile	Tue Jan 11 22:34:41 2005 +0000
     3.2 +++ b/tools/ioemu/gui/Makefile	Wed Jan 12 09:13:37 2005 +0000
     3.3 @@ -8,3 +8,5 @@ libgui.a: $(OBJS)
     3.4  	$(AR) $(ARFLAGS) $@ $(OBJS)
     3.5  
     3.6  include $(TOPDIR)/mk/helix.mk
     3.7 +
     3.8 +install:: all
     4.1 --- a/tools/ioemu/iodev/Makefile	Tue Jan 11 22:34:41 2005 +0000
     4.2 +++ b/tools/ioemu/iodev/Makefile	Wed Jan 12 09:13:37 2005 +0000
     4.3 @@ -11,5 +11,5 @@ device-model: $(OBJS) $(BXLIBS)
     4.4  
     4.5  include $(TOPDIR)/mk/helix.mk
     4.6  
     4.7 -install::
     4.8 +install:: all
     4.9  	install device-model $(prefix)/usr/sbin
     5.1 --- a/tools/ioemu/memory/Makefile	Tue Jan 11 22:34:41 2005 +0000
     5.2 +++ b/tools/ioemu/memory/Makefile	Wed Jan 12 09:13:37 2005 +0000
     5.3 @@ -9,3 +9,4 @@ libmemory.a: $(OBJS)
     5.4  
     5.5  include $(TOPDIR)/mk/helix.mk
     5.6  
     5.7 +install:: all
     6.1 --- a/tools/ioemu/memory/misc_mem.cc	Tue Jan 11 22:34:41 2005 +0000
     6.2 +++ b/tools/ioemu/memory/misc_mem.cc	Wed Jan 12 09:13:37 2005 +0000
     6.3 @@ -80,7 +80,7 @@ BX_MEM_C::alloc_vector_aligned (size_t b
     6.4    actual_vector = new Bit8u [bytes+test_mask];
     6.5    // round address forward to nearest multiple of alignment.  Alignment 
     6.6    // MUST BE a power of two for this to work.
     6.7 -  Bit64u masked = ((Bit64u)(actual_vector + test_mask)) & ~test_mask;
     6.8 +  unsigned long masked = ((unsigned long)(actual_vector + test_mask)) & ~test_mask;
     6.9    vector = (Bit8u *)masked;
    6.10    // sanity check: no lost bits during pointer conversion
    6.11    BX_ASSERT (sizeof(masked) >= sizeof(vector));
     7.1 --- a/tools/libxc/xc.h	Tue Jan 11 22:34:41 2005 +0000
     7.2 +++ b/tools/libxc/xc.h	Wed Jan 12 09:13:37 2005 +0000
     7.3 @@ -10,7 +10,6 @@
     7.4  #define __XC_H__
     7.5  
     7.6  #include <stdint.h>
     7.7 -#include "linux_boot_params.h"
     7.8  
     7.9  typedef uint8_t            u8;
    7.10  typedef uint16_t           u16;
    7.11 @@ -25,7 +24,6 @@ typedef int64_t            s64;
    7.12  #include <xen/dom0_ops.h>
    7.13  #include <xen/event_channel.h>
    7.14  #include <xen/sched_ctl.h>
    7.15 -#include <xen/io/domain_controller.h>
    7.16  
    7.17  /* Obtain or relinquish a handle on the 'xc' library. */
    7.18  int xc_interface_open(void);
    7.19 @@ -107,6 +105,7 @@ xc_plan9_build (int xc_handle,
    7.20  		unsigned int control_evtchn, 
    7.21  		unsigned long flags);
    7.22  
    7.23 +struct mem_map;
    7.24  int xc_vmx_build(int xc_handle,
    7.25                   u32 domid,
    7.26                   const char *image_name,
     8.1 --- a/tools/libxc/xc_linux_save.c	Tue Jan 11 22:34:41 2005 +0000
     8.2 +++ b/tools/libxc/xc_linux_save.c	Wed Jan 12 09:13:37 2005 +0000
     8.3 @@ -10,6 +10,7 @@
     8.4  #include <sys/time.h>
     8.5  #include "xc_private.h"
     8.6  #include <xen/linux/suspend.h>
     8.7 +#include <xen/io/domain_controller.h>
     8.8  #include <time.h>
     8.9  
    8.10  #define BATCH_SIZE 1024   /* 1024 pages (4MB) at a time */