ia64/xen-unstable

changeset 9224:d4e433d615b0

More build config changes:
- Build -O2 rather than -O3
- Build with -Wstrict-prototypes
- Move target-specific generic compiler switches to Config.mk

Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Fri Mar 10 17:32:04 2006 +0100 (2006-03-10)
parents e408a374840c
children a5a50f6fbc09
files Config.mk tools/Rules.mk tools/ioemu/target-i386-dm/Makefile tools/ioemu/vl.h tools/misc/lomount/lomount.c tools/misc/mbootpack/Makefile tools/misc/xc_shadow.c tools/vtpm_manager/manager/Makefile tools/xenmon/xenbaked.c tools/xenstat/libxenstat/Makefile tools/xenstat/libxenstat/src/xen-interface.c tools/xenstat/libxenstat/src/xen-interface.h tools/xenstat/libxenstat/src/xenstat.c tools/xenstat/libxenstat/src/xenstat.h tools/xenstore/xenstored_core.c tools/xentrace/xentrace.c xen/arch/x86/Rules.mk xen/arch/x86/audit.c xen/arch/x86/hvm/hvm.c xen/arch/x86/hvm/i8259.c xen/arch/x86/hvm/vmx/vmcs.c xen/arch/x86/hvm/vmx/vmx.c xen/common/lib.c xen/include/asm-x86/hvm/io.h xen/include/asm-x86/hvm/vpic.h xen/include/xen/sched.h
line diff
     1.1 --- a/Config.mk	Fri Mar 10 16:00:36 2006 +0100
     1.2 +++ b/Config.mk	Fri Mar 10 17:32:04 2006 +0100
     1.3 @@ -12,14 +12,6 @@ XEN_TARGET_X86_PAE  ?= n
     1.4  HOSTCC     = gcc
     1.5  HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer
     1.6  
     1.7 -ifneq ($(debug),y)
     1.8 -# Optimisation flags are overridable
     1.9 -CFLAGS    ?= -O3 -fomit-frame-pointer
    1.10 -CFLAGS    += -DNDEBUG
    1.11 -else
    1.12 -CFLAGS    += -g
    1.13 -endif
    1.14 -
    1.15  AS         = $(CROSS_COMPILE)as
    1.16  LD         = $(CROSS_COMPILE)ld
    1.17  CC         = $(CROSS_COMPILE)gcc
    1.18 @@ -38,6 +30,22 @@ INSTALL_DIR  = $(INSTALL) -d -m0755
    1.19  INSTALL_DATA = $(INSTALL) -m0644
    1.20  INSTALL_PROG = $(INSTALL) -m0755
    1.21  
    1.22 +ifneq ($(debug),y)
    1.23 +# Optimisation flags are overridable
    1.24 +CFLAGS    ?= -O2 -fomit-frame-pointer
    1.25 +CFLAGS    += -DNDEBUG
    1.26 +else
    1.27 +CFLAGS    += -g
    1.28 +endif
    1.29 +
    1.30 +ifeq ($(XEN_TARGET_ARCH),x86_32)
    1.31 +CFLAGS  += -m32 -march=i686
    1.32 +endif
    1.33 +
    1.34 +ifeq ($(XEN_TARGET_ARCH),x86_64)
    1.35 +CFLAGS  += -m64
    1.36 +endif
    1.37 +
    1.38  ifeq ($(XEN_TARGET_ARCH),x86_64)
    1.39  LIBDIR = lib64
    1.40  else
    1.41 @@ -51,7 +59,7 @@ endif
    1.42  
    1.43  test-gcc-flag = $(shell $(1) -v --help 2>&1 | grep -q " $(2) " && echo $(2))
    1.44  
    1.45 -CFLAGS += -Wall
    1.46 +CFLAGS += -Wall -Wstrict-prototypes
    1.47  
    1.48  HOSTCFLAGS += $(call test-gcc-flag,$(HOSTCC),-Wdeclaration-after-statement)
    1.49  CFLAGS     += $(call test-gcc-flag,$(CC),-Wdeclaration-after-statement)
     2.1 --- a/tools/Rules.mk	Fri Mar 10 16:00:36 2006 +0100
     2.2 +++ b/tools/Rules.mk	Fri Mar 10 17:32:04 2006 +0100
     2.3 @@ -10,16 +10,6 @@ XEN_LIBXC          = $(XEN_ROOT)/tools/l
     2.4  XEN_XENSTORE       = $(XEN_ROOT)/tools/xenstore
     2.5  XEN_LIBXENSTAT     = $(XEN_ROOT)/tools/xenstat/libxenstat/src
     2.6  
     2.7 -ifeq ($(XEN_TARGET_ARCH),x86_32)
     2.8 -CFLAGS  += -m32 -march=i686
     2.9 -LDFLAGS += -m32
    2.10 -endif
    2.11 -
    2.12 -ifeq ($(XEN_TARGET_ARCH),x86_64)
    2.13 -CFLAGS  += -m64
    2.14 -LDFLAGS += -m64
    2.15 -endif
    2.16 -
    2.17  X11_LDPATH = -L/usr/X11R6/$(LIBDIR)
    2.18  
    2.19  %.opic: %.c
     3.1 --- a/tools/ioemu/target-i386-dm/Makefile	Fri Mar 10 16:00:36 2006 +0100
     3.2 +++ b/tools/ioemu/target-i386-dm/Makefile	Fri Mar 10 17:32:04 2006 +0100
     3.3 @@ -235,7 +235,7 @@ endif
     3.4  all: $(PROGS)
     3.5  
     3.6  $(QEMU_USER): $(OBJS)
     3.7 -	$(CC) $(LDFLAGS) -o $@ $^  $(LIBS)
     3.8 +	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^  $(LIBS)
     3.9  ifeq ($(ARCH),alpha)
    3.10  # Mark as 32 bit binary, i. e. it will be mapped into the low 31 bit of
    3.11  # the address space (31 bit so sign extending doesn't matter)
    3.12 @@ -311,7 +311,7 @@ endif
    3.13  endif
    3.14  
    3.15  $(QEMU_SYSTEM): $(VL_OBJS) libqemu.a
    3.16 -	$(CC) $(VL_LDFLAGS) -o $@ $^ $(LIBS) $(SDL_LIBS) $(VNC_LIBS) $(VL_LIBS) -lpthread
    3.17 +	$(CC) $(CFLAGS) $(VL_LDFLAGS) -o $@ $^ $(LIBS) $(SDL_LIBS) $(VNC_LIBS) $(VL_LIBS) -lpthread
    3.18  
    3.19  vnc.o: vnc.c keyboard_rdesktop.c
    3.20  	$(CC) $(CFLAGS) $(DEFINES) $(VNC_CFLAGS) -c -o $@ $<
     4.1 --- a/tools/ioemu/vl.h	Fri Mar 10 16:00:36 2006 +0100
     4.2 +++ b/tools/ioemu/vl.h	Fri Mar 10 17:32:04 2006 +0100
     4.3 @@ -697,7 +697,7 @@ void lance_init(NetDriverState *nd, int 
     4.4  void tcx_init(DisplayState *ds, uint32_t addr);
     4.5  
     4.6  /* sched.c */
     4.7 -void sched_init();
     4.8 +void sched_init(uint32_t, uint32_t);
     4.9  
    4.10  /* magic-load.c */
    4.11  void magic_init(const char *kfn, int kloadaddr, uint32_t addr);
    4.12 @@ -799,7 +799,7 @@ void readline_start(const char *prompt, 
    4.13  
    4.14  int gdbserver_start(int port);
    4.15  void update_select_wakeup_events(void);
    4.16 -void tun_receive_handler();
    4.17 +void tun_receive_handler(fd_set *);
    4.18  
    4.19  extern char domain_name[];
    4.20  #endif /* VL_H */
     5.1 --- a/tools/misc/lomount/lomount.c	Fri Mar 10 16:00:36 2006 +0100
     5.2 +++ b/tools/misc/lomount/lomount.c	Fri Mar 10 17:32:04 2006 +0100
     5.3 @@ -195,7 +195,7 @@ done:
     5.4  	return fail;
     5.5  }
     5.6  
     5.7 -void usage()
     5.8 +void usage(void)
     5.9  {
    5.10  	fprintf(stderr, "You must specify at least -diskimage and -partition.\n");
    5.11  	fprintf(stderr, "All other arguments are passed through to 'mount'.\n");
     6.1 --- a/tools/misc/mbootpack/Makefile	Fri Mar 10 16:00:36 2006 +0100
     6.2 +++ b/tools/misc/mbootpack/Makefile	Fri Mar 10 17:32:04 2006 +0100
     6.3 @@ -31,7 +31,7 @@ DEPFLAGS = -Wp,-MD,.$(@F).d
     6.4  DEPS     = .*.d
     6.5  
     6.6  mbootpack: $(OBJS)
     6.7 -	$(HOSTCC) -o $@ $(filter-out %.a, $^) $(LDFLAGS)
     6.8 +	$(HOSTCC) -o $@ $(filter-out %.a, $^)
     6.9  
    6.10  clean:
    6.11  	$(RM) mbootpack *.o $(DEPS) bootsect setup bzimage_header.c bin2c
     7.1 --- a/tools/misc/xc_shadow.c	Fri Mar 10 16:00:36 2006 +0100
     7.2 +++ b/tools/misc/xc_shadow.c	Fri Mar 10 17:32:04 2006 +0100
     7.3 @@ -18,7 +18,7 @@
     7.4  #include <errno.h>
     7.5  #include <string.h>
     7.6  
     7.7 -void usage()
     7.8 +void usage(void)
     7.9  {
    7.10      printf("xc_shadow: -[0|1|2]\n");
    7.11      printf("    set shadow mode\n");
    7.12 @@ -28,7 +28,7 @@ void usage()
    7.13  int main(int argc, char *argv[])
    7.14  {
    7.15      int xc_handle;
    7.16 -    int mode;
    7.17 +    int mode = 0;
    7.18  
    7.19      if ( argc > 1 )
    7.20      {
     8.1 --- a/tools/vtpm_manager/manager/Makefile	Fri Mar 10 16:00:36 2006 +0100
     8.2 +++ b/tools/vtpm_manager/manager/Makefile	Fri Mar 10 17:32:04 2006 +0100
     8.3 @@ -20,7 +20,7 @@ mrproper: clean
     8.4  	rm -f $(BIN) *~
     8.5  
     8.6  $(BIN): $(OBJS)
     8.7 -	$(CC) $(LDFLAGS) $^ $(LIBS) -o $@
     8.8 +	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LIBS) -o $@
     8.9  
    8.10  # libraries
    8.11  LIBS += ../tcs/libTCS.a ../util/libTCGUtils.a ../crypto/libtcpaCrypto.a
     9.1 --- a/tools/xenmon/xenbaked.c	Fri Mar 10 16:00:36 2006 +0100
     9.2 +++ b/tools/xenmon/xenbaked.c	Fri Mar 10 17:32:04 2006 +0100
     9.3 @@ -379,7 +379,7 @@ struct t_rec **init_rec_ptrs(struct t_bu
     9.4  /**
     9.5   * get_num_cpus - get the number of logical CPUs
     9.6   */
     9.7 -unsigned int get_num_cpus()
     9.8 +unsigned int get_num_cpus(void)
     9.9  {
    9.10      dom0_op_t op;
    9.11      int xc_handle = xc_interface_open();
    9.12 @@ -409,7 +409,7 @@ unsigned int get_num_cpus()
    9.13  /**
    9.14   * monitor_tbufs - monitor the contents of tbufs
    9.15   */
    9.16 -int monitor_tbufs()
    9.17 +int monitor_tbufs(void)
    9.18  {
    9.19      int i;
    9.20      extern void process_record(int, struct t_rec *);
    10.1 --- a/tools/xenstat/libxenstat/Makefile	Fri Mar 10 16:00:36 2006 +0100
    10.2 +++ b/tools/xenstat/libxenstat/Makefile	Fri Mar 10 17:32:04 2006 +0100
    10.3 @@ -48,7 +48,7 @@ all: $(LIB)
    10.4  	$(RANLIB) $@
    10.5  
    10.6  $(SHLIB): $(OBJECTS)
    10.7 -	$(CC) $(LDFLAGS) $(SONAME_FLAGS) -shared -o $@ $(OBJECTS)
    10.8 +	$(CC) $(CFLAGS) $(LDFLAGS) $(SONAME_FLAGS) -shared -o $@ $(OBJECTS)
    10.9  
   10.10  src/xenstat.o: src/xenstat.c src/xenstat.h src/xen-interface.h
   10.11  	$(CC) $(CFLAGS) $(WARN_FLAGS) -c -o $@ $<
    11.1 --- a/tools/xenstat/libxenstat/src/xen-interface.c	Fri Mar 10 16:00:36 2006 +0100
    11.2 +++ b/tools/xenstat/libxenstat/src/xen-interface.c	Fri Mar 10 17:32:04 2006 +0100
    11.3 @@ -31,7 +31,7 @@ struct xi_handle {
    11.4  
    11.5  /* Initialize for xen-interface.  Returns a handle to be used with subsequent
    11.6   * calls to the xen-interface functions or NULL if an error occurs. */
    11.7 -xi_handle *xi_init()
    11.8 +xi_handle *xi_init(void)
    11.9  {
   11.10  	xi_handle *handle;
   11.11  
    12.1 --- a/tools/xenstat/libxenstat/src/xen-interface.h	Fri Mar 10 16:00:36 2006 +0100
    12.2 +++ b/tools/xenstat/libxenstat/src/xen-interface.h	Fri Mar 10 17:32:04 2006 +0100
    12.3 @@ -26,7 +26,7 @@ typedef struct xi_handle xi_handle;
    12.4  
    12.5  /* Initialize for xen-interface.  Returns a handle to be used with subsequent
    12.6   * calls to the xen-interface functions or NULL if an error occurs. */
    12.7 -xi_handle *xi_init();
    12.8 +xi_handle *xi_init(void);
    12.9  
   12.10  /* Release the handle to libxc, free resources, etc. */
   12.11  void xi_uninit(xi_handle *handle);
    13.1 --- a/tools/xenstat/libxenstat/src/xenstat.c	Fri Mar 10 16:00:36 2006 +0100
    13.2 +++ b/tools/xenstat/libxenstat/src/xenstat.c	Fri Mar 10 17:32:04 2006 +0100
    13.3 @@ -129,7 +129,7 @@ static xenstat_collector collectors[] = 
    13.4  /*
    13.5   * libxenstat API
    13.6   */
    13.7 -xenstat_handle *xenstat_init()
    13.8 +xenstat_handle *xenstat_init(void)
    13.9  {
   13.10  	xenstat_handle *handle;
   13.11  
    14.1 --- a/tools/xenstat/libxenstat/src/xenstat.h	Fri Mar 10 16:00:36 2006 +0100
    14.2 +++ b/tools/xenstat/libxenstat/src/xenstat.h	Fri Mar 10 17:32:04 2006 +0100
    14.3 @@ -26,7 +26,7 @@ typedef struct xenstat_network xenstat_n
    14.4  
    14.5  /* Initialize the xenstat library.  Returns a handle to be used with
    14.6   * subsequent calls to the xenstat library, or NULL if an error occurs. */
    14.7 -xenstat_handle *xenstat_init();
    14.8 +xenstat_handle *xenstat_init(void);
    14.9  
   14.10  /* Release the handle to libxc, free resources, etc. */
   14.11  void xenstat_uninit(xenstat_handle * handle);
    15.1 --- a/tools/xenstore/xenstored_core.c	Fri Mar 10 16:00:36 2006 +0100
    15.2 +++ b/tools/xenstore/xenstored_core.c	Fri Mar 10 17:32:04 2006 +0100
    15.3 @@ -66,7 +66,7 @@ static char *tracefile = NULL;
    15.4  static TDB_CONTEXT *tdb_ctx;
    15.5  
    15.6  static void corrupt(struct connection *conn, const char *fmt, ...);
    15.7 -static void check_store();
    15.8 +static void check_store(void);
    15.9  
   15.10  #define log(...)							\
   15.11  	do {								\
   15.12 @@ -238,7 +238,7 @@ static void trigger_reopen_log(int signa
   15.13  }
   15.14  
   15.15  
   15.16 -static void reopen_log()
   15.17 +static void reopen_log(void)
   15.18  {
   15.19  	if (tracefile) {
   15.20  		if (tracefd > 0)
   15.21 @@ -1612,7 +1612,7 @@ static void clean_store(struct hashtable
   15.22  }
   15.23  
   15.24  
   15.25 -static void check_store()
   15.26 +static void check_store(void)
   15.27  {
   15.28  	char * root = talloc_strdup(NULL, "/");
   15.29  	struct hashtable * reachable =
    16.1 --- a/tools/xentrace/xentrace.c	Fri Mar 10 16:00:36 2006 +0100
    16.2 +++ b/tools/xentrace/xentrace.c	Fri Mar 10 17:32:04 2006 +0100
    16.3 @@ -258,7 +258,7 @@ struct t_rec **init_rec_ptrs(struct t_bu
    16.4  /**
    16.5   * get_num_cpus - get the number of logical CPUs
    16.6   */
    16.7 -unsigned int get_num_cpus()
    16.8 +unsigned int get_num_cpus(void)
    16.9  {
   16.10      dom0_op_t op;
   16.11      int xc_handle = xc_interface_open();
    17.1 --- a/xen/arch/x86/Rules.mk	Fri Mar 10 16:00:36 2006 +0100
    17.2 +++ b/xen/arch/x86/Rules.mk	Fri Mar 10 17:32:04 2006 +0100
    17.3 @@ -22,19 +22,20 @@ CFLAGS  += $(call test-gcc-flag,$(CC),-n
    17.4  CFLAGS  += $(call test-gcc-flag,$(CC),-fno-stack-protector)
    17.5  CFLAGS  += $(call test-gcc-flag,$(CC),-fno-stack-protector-all)
    17.6  
    17.7 -ifeq ($(TARGET_SUBARCH),x86_32)
    17.8 -CFLAGS  += -m32 -march=i686
    17.9 -LDFLAGS += -m elf_i386 
   17.10 -ifeq ($(pae),y)
   17.11 +ifeq ($(TARGET_SUBARCH)$(pae),x86_32y)
   17.12  CFLAGS  += -DCONFIG_X86_PAE=1
   17.13  endif
   17.14 -endif
   17.15 +
   17.16  ifeq ($(supervisor_mode_kernel),y)
   17.17  CFLAGS  += -DCONFIG_X86_SUPERVISOR_MODE_KERNEL=1
   17.18  endif
   17.19  
   17.20 +ifeq ($(XEN_TARGET_ARCH),x86_32)
   17.21 +LDFLAGS += -m elf_i386 
   17.22 +endif
   17.23 +
   17.24  ifeq ($(TARGET_SUBARCH),x86_64)
   17.25 -CFLAGS  += -m64 -mno-red-zone -fpic -fno-reorder-blocks
   17.26 +CFLAGS  += -mno-red-zone -fpic -fno-reorder-blocks
   17.27  CFLAGS  += -fno-asynchronous-unwind-tables
   17.28  LDFLAGS += -m elf_x86_64
   17.29  endif
    18.1 --- a/xen/arch/x86/audit.c	Fri Mar 10 16:00:36 2006 +0100
    18.2 +++ b/xen/arch/x86/audit.c	Fri Mar 10 17:32:04 2006 +0100
    18.3 @@ -350,7 +350,7 @@ int audit_adjust_pgtables(struct domain 
    18.4          unmap_domain_page(pt);
    18.5      }
    18.6  
    18.7 -    void adjust_shadow_tables()
    18.8 +    void adjust_shadow_tables(void)
    18.9      {
   18.10          struct shadow_status *a;
   18.11          unsigned long smfn, gmfn;
   18.12 @@ -402,7 +402,7 @@ int audit_adjust_pgtables(struct domain 
   18.13          }
   18.14      }
   18.15  
   18.16 -    void adjust_oos_list()
   18.17 +    void adjust_oos_list(void)
   18.18      {
   18.19          struct out_of_sync_entry *oos;
   18.20  
   18.21 @@ -426,7 +426,7 @@ int audit_adjust_pgtables(struct domain 
   18.22          }
   18.23      }
   18.24  
   18.25 -    void adjust_for_pgtbase()
   18.26 +    void adjust_for_pgtbase(void)
   18.27      {
   18.28          struct vcpu *v;
   18.29  
   18.30 @@ -443,7 +443,7 @@ int audit_adjust_pgtables(struct domain 
   18.31          }
   18.32      }
   18.33  
   18.34 -    void adjust_guest_pages()
   18.35 +    void adjust_guest_pages(void)
   18.36      {
   18.37          struct list_head *list_ent = d->page_list.next;
   18.38          struct page_info *page;
    19.1 --- a/xen/arch/x86/hvm/hvm.c	Fri Mar 10 16:00:36 2006 +0100
    19.2 +++ b/xen/arch/x86/hvm/hvm.c	Fri Mar 10 17:32:04 2006 +0100
    19.3 @@ -205,12 +205,10 @@ void hvm_setup_platform(struct domain* d
    19.4      }
    19.5  }
    19.6  
    19.7 -void pic_irq_request(int *interrupt_request, int level)
    19.8 +void pic_irq_request(void *data, int level)
    19.9  {
   19.10 -    if (level)
   19.11 -        *interrupt_request = 1;
   19.12 -    else
   19.13 -        *interrupt_request = 0;
   19.14 +    int *interrupt_request = data;
   19.15 +    *interrupt_request = level;
   19.16  }
   19.17  
   19.18  void hvm_pic_assist(struct vcpu *v)
    20.1 --- a/xen/arch/x86/hvm/i8259.c	Fri Mar 10 16:00:36 2006 +0100
    20.2 +++ b/xen/arch/x86/hvm/i8259.c	Fri Mar 10 17:32:04 2006 +0100
    20.3 @@ -407,7 +407,7 @@ static void pic_init1(int io_addr, int e
    20.4      pic_reset(s);
    20.5  }
    20.6  
    20.7 -void pic_init(struct hvm_virpic *s, void (*irq_request)(), 
    20.8 +void pic_init(struct hvm_virpic *s, void (*irq_request)(void *, int),
    20.9                void *irq_request_opaque)
   20.10  {
   20.11      memset(s, 0, sizeof(*s));
   20.12 @@ -422,7 +422,8 @@ void pic_init(struct hvm_virpic *s, void
   20.13      return; 
   20.14  }
   20.15  
   20.16 -void pic_set_alt_irq_func(struct hvm_virpic *s, void (*alt_irq_func)(),
   20.17 +void pic_set_alt_irq_func(struct hvm_virpic *s,
   20.18 +                          void (*alt_irq_func)(void *, int, int),
   20.19                            void *alt_irq_opaque)
   20.20  {
   20.21      s->alt_irq_func = alt_irq_func;
    21.1 --- a/xen/arch/x86/hvm/vmx/vmcs.c	Fri Mar 10 16:00:36 2006 +0100
    21.2 +++ b/xen/arch/x86/hvm/vmx/vmcs.c	Fri Mar 10 17:32:04 2006 +0100
    21.3 @@ -363,7 +363,7 @@ static inline int construct_init_vmcs_gu
    21.4      return error;
    21.5  }
    21.6  
    21.7 -static inline int construct_vmcs_host()
    21.8 +static inline int construct_vmcs_host(void)
    21.9  {
   21.10      int error = 0;
   21.11  #ifdef __x86_64__
    22.1 --- a/xen/arch/x86/hvm/vmx/vmx.c	Fri Mar 10 16:00:36 2006 +0100
    22.2 +++ b/xen/arch/x86/hvm/vmx/vmx.c	Fri Mar 10 17:32:04 2006 +0100
    22.3 @@ -479,12 +479,13 @@ void vmx_init_ap_context(struct vcpu_gue
    22.4  
    22.5  void do_nmi(struct cpu_user_regs *);
    22.6  
    22.7 -static int check_vmx_controls(ctrls, msr)
    22.8 +static int check_vmx_controls(u32 ctrls, u32 msr)
    22.9  {
   22.10      u32 vmx_msr_low, vmx_msr_high;
   22.11  
   22.12      rdmsr(msr, vmx_msr_low, vmx_msr_high);
   22.13 -    if (ctrls < vmx_msr_low || ctrls > vmx_msr_high) {
   22.14 +    if ( (ctrls < vmx_msr_low) || (ctrls > vmx_msr_high) )
   22.15 +    {
   22.16          printk("Insufficient VMX capability 0x%x, "
   22.17                 "msr=0x%x,low=0x%8x,high=0x%x\n",
   22.18                 ctrls, msr, vmx_msr_low, vmx_msr_high);
    23.1 --- a/xen/common/lib.c	Fri Mar 10 16:00:36 2006 +0100
    23.2 +++ b/xen/common/lib.c	Fri Mar 10 17:32:04 2006 +0100
    23.3 @@ -158,8 +158,7 @@ shl(register digit *p, register int len,
    23.4   * leading zeros).
    23.5   */
    23.6  u64
    23.7 -__qdivrem(uq, vq, arq)
    23.8 -	u64 uq, vq, *arq;
    23.9 +__qdivrem(u64 uq, u64 vq, u64 *arq)
   23.10  {
   23.11  	union uu tmp;
   23.12  	digit *u, *v, *q;
   23.13 @@ -382,8 +381,7 @@ s64
   23.14   * Divide two unsigned quads.
   23.15   */
   23.16  u64
   23.17 -__udivdi3(a, b)
   23.18 -        u64 a, b;
   23.19 +__udivdi3(u64 a, u64 b)
   23.20  {
   23.21  
   23.22          return (__qdivrem(a, b, (u64 *)0));
    24.1 --- a/xen/include/asm-x86/hvm/io.h	Fri Mar 10 16:00:36 2006 +0100
    24.2 +++ b/xen/include/asm-x86/hvm/io.h	Fri Mar 10 17:32:04 2006 +0100
    24.3 @@ -151,7 +151,7 @@ extern void handle_mmio(unsigned long, u
    24.4  extern void hvm_wait_io(void);
    24.5  extern void hvm_safe_block(void);
    24.6  extern void hvm_io_assist(struct vcpu *v);
    24.7 -extern void pic_irq_request(int *interrupt_request, int level);
    24.8 +extern void pic_irq_request(void *data, int level);
    24.9  extern void hvm_pic_assist(struct vcpu *v);
   24.10  extern int cpu_get_interrupt(struct vcpu *v, int *type);
   24.11  extern int cpu_has_pending_irq(struct vcpu *v);
    25.1 --- a/xen/include/asm-x86/hvm/vpic.h	Fri Mar 10 16:00:36 2006 +0100
    25.2 +++ b/xen/include/asm-x86/hvm/vpic.h	Fri Mar 10 17:32:04 2006 +0100
    25.3 @@ -55,7 +55,7 @@ struct hvm_virpic {
    25.4      /* 0 is master pic, 1 is slave pic */
    25.5      /* XXX: better separation between the two pics */
    25.6      PicState pics[2];
    25.7 -    void (*irq_request)(int *opaque, int level);
    25.8 +    void (*irq_request)(void *opaque, int level);
    25.9      void *irq_request_opaque;
   25.10      /* IOAPIC callback support */
   25.11      void (*alt_irq_func)(void *opaque, int irq_num, int level);
   25.12 @@ -66,10 +66,10 @@ struct hvm_virpic {
   25.13  void pic_set_irq(struct hvm_virpic *s, int irq, int level);
   25.14  void pic_set_irq_new(void *opaque, int irq, int level);
   25.15  void pic_init(struct hvm_virpic *s, 
   25.16 -              void (*irq_request)(),
   25.17 +              void (*irq_request)(void *, int),
   25.18                void *irq_request_opaque);
   25.19  void pic_set_alt_irq_func(struct hvm_virpic *s, 
   25.20 -                          void(*alt_irq_func)(),
   25.21 +                          void (*alt_irq_func)(void *, int, int),
   25.22                            void *alt_irq_opaque);
   25.23  int pic_read_irq(struct hvm_virpic *s);
   25.24  void pic_update_irq(struct hvm_virpic *s);
    26.1 --- a/xen/include/xen/sched.h	Fri Mar 10 16:00:36 2006 +0100
    26.2 +++ b/xen/include/xen/sched.h	Fri Mar 10 17:32:04 2006 +0100
    26.3 @@ -266,7 +266,7 @@ void sched_add_domain(struct vcpu *);
    26.4  void sched_rem_domain(struct vcpu *);
    26.5  long sched_ctl(struct sched_ctl_cmd *);
    26.6  long sched_adjdom(struct sched_adjdom_cmd *);
    26.7 -int  sched_id();
    26.8 +int  sched_id(void);
    26.9  void vcpu_wake(struct vcpu *d);
   26.10  void vcpu_sleep_nosync(struct vcpu *d);
   26.11  void vcpu_sleep_sync(struct vcpu *d);