[Xen-changelog] Fix tools compilation.

[BitKeeper B. <ri...@su...>]

ChangeSet 1.1709, 2005/01/12 09:13:37+00:00, ka...@sc...

	Fix tools compilation.



 ioemu/Makefile           |   10 +++++-----
 ioemu/gui/Makefile       |    2 ++
 ioemu/iodev/Makefile     |    2 +-
 ioemu/memory/Makefile    |    1 +
 ioemu/memory/misc_mem.cc |    2 +-
 libxc/xc.h               |    3 +--
 libxc/xc_linux_save.c    |    1 +
 7 files changed, 12 insertions(+), 9 deletions(-)


diff -Nru a/tools/ioemu/Makefile b/tools/ioemu/Makefile
--- a/tools/ioemu/Makefile	2005-01-12 05:00:47 -05:00
+++ b/tools/ioemu/Makefile	2005-01-12 05:00:47 -05:00
@@ -1,12 +1,12 @@
 # Order is important!
 SUBDIRS=gui memory iodev
 
-all: $(SUBDIRS)
+.PHONY: all clean install
 
-$(SUBDIRS):
-	$(MAKE) -C $@
-
-.PHONY: all $(SUBDIRS)
+all:
+	@for subdir in $(SUBDIRS); do 				\
+		$(MAKE) -C $$subdir $(MAKEDEFS) $@ || exit -1; 	\
+	done
 
 clean:
 	@for subdir in $(SUBDIRS); do 				\
diff -Nru a/tools/ioemu/gui/Makefile b/tools/ioemu/gui/Makefile
--- a/tools/ioemu/gui/Makefile	2005-01-12 05:00:47 -05:00
+++ b/tools/ioemu/gui/Makefile	2005-01-12 05:00:47 -05:00
@@ -8,3 +8,5 @@
 	$(AR) $(ARFLAGS) $@ $(OBJS)
 
 include $(TOPDIR)/mk/helix.mk
+
+install:: all
diff -Nru a/tools/ioemu/iodev/Makefile b/tools/ioemu/iodev/Makefile
--- a/tools/ioemu/iodev/Makefile	2005-01-12 05:00:47 -05:00
+++ b/tools/ioemu/iodev/Makefile	2005-01-12 05:00:47 -05:00
@@ -11,5 +11,5 @@
 
 include $(TOPDIR)/mk/helix.mk
 
-install::
+install:: all
 	install device-model $(prefix)/usr/sbin
diff -Nru a/tools/ioemu/memory/Makefile b/tools/ioemu/memory/Makefile
--- a/tools/ioemu/memory/Makefile	2005-01-12 05:00:47 -05:00
+++ b/tools/ioemu/memory/Makefile	2005-01-12 05:00:47 -05:00
@@ -9,3 +9,4 @@
 
 include $(TOPDIR)/mk/helix.mk
 
+install:: all
diff -Nru a/tools/ioemu/memory/misc_mem.cc b/tools/ioemu/memory/misc_mem.cc
--- a/tools/ioemu/memory/misc_mem.cc	2005-01-12 05:00:47 -05:00
+++ b/tools/ioemu/memory/misc_mem.cc	2005-01-12 05:00:47 -05:00
@@ -80,7 +80,7 @@
   actual_vector = new Bit8u [bytes+test_mask];
   // round address forward to nearest multiple of alignment.  Alignment 
   // MUST BE a power of two for this to work.
-  Bit64u masked = ((Bit64u)(actual_vector + test_mask)) & ~test_mask;
+  unsigned long masked = ((unsigned long)(actual_vector + test_mask)) & ~test_mask;
   vector = (Bit8u *)masked;
   // sanity check: no lost bits during pointer conversion
   BX_ASSERT (sizeof(masked) >= sizeof(vector));
diff -Nru a/tools/libxc/xc.h b/tools/libxc/xc.h
--- a/tools/libxc/xc.h	2005-01-12 05:00:47 -05:00
+++ b/tools/libxc/xc.h	2005-01-12 05:00:47 -05:00
@@ -10,7 +10,6 @@
 #define __XC_H__
 
 #include <stdint.h>
-#include "linux_boot_params.h"
 
 typedef uint8_t            u8;
 typedef uint16_t           u16;
@@ -25,7 +24,6 @@
 #include <xen/dom0_ops.h>
 #include <xen/event_channel.h>
 #include <xen/sched_ctl.h>
-#include <xen/io/domain_controller.h>
 
 /* Obtain or relinquish a handle on the 'xc' library. */
 int xc_interface_open(void);
@@ -107,6 +105,7 @@
 		unsigned int control_evtchn, 
 		unsigned long flags);
 
+struct mem_map;
 int xc_vmx_build(int xc_handle,
                  u32 domid,
                  const char *image_name,
diff -Nru a/tools/libxc/xc_linux_save.c b/tools/libxc/xc_linux_save.c
--- a/tools/libxc/xc_linux_save.c	2005-01-12 05:00:47 -05:00
+++ b/tools/libxc/xc_linux_save.c	2005-01-12 05:00:47 -05:00
@@ -10,6 +10,7 @@
 #include <sys/time.h>
 #include "xc_private.h"
 #include <xen/linux/suspend.h>
+#include <xen/io/domain_controller.h>
 #include <time.h>
 
 #define BATCH_SIZE 1024   /* 1024 pages (4MB) at a time */