ia64/xen-unstable

changeset 16209:2b11cb52f6a0

x86: Remove dependency on stdbool.h.
Signed-off-by: Keir Fraser <keir@xensource.com>
author Keir Fraser <keir@xensource.com>
date Wed Oct 24 17:21:17 2007 +0100 (2007-10-24)
parents 185a13c03255
children 71fcc70ea78b f0c98631b2e5
files xen/arch/x86/hvm/mtrr.c xen/arch/x86/hvm/vmx/vmx.c
line diff
     1.1 --- a/xen/arch/x86/hvm/mtrr.c	Wed Oct 24 17:15:54 2007 +0100
     1.2 +++ b/xen/arch/x86/hvm/mtrr.c	Wed Oct 24 17:21:17 2007 +0100
     1.3 @@ -23,7 +23,6 @@
     1.4  #include <asm/paging.h>
     1.5  #include <asm/p2m.h>
     1.6  #include <xen/domain_page.h>
     1.7 -#include <stdbool.h>
     1.8  #include <asm/mtrr.h>
     1.9  #include <asm/hvm/support.h>
    1.10  #include <asm/hvm/cacheattr.h>
    1.11 @@ -144,9 +143,9 @@ bool_t is_var_mtrr_overlapped(struct mtr
    1.12  #define RESERVED_MTRR 2
    1.13  #define MTRRphysBase_MSR(reg) (0x200 + 2 * (reg))
    1.14  #define MTRRphysMask_MSR(reg) (0x200 + 2 * (reg) + 1)
    1.15 -bool mtrr_var_range_msr_set(struct mtrr_state *m, u32 msr, u64 msr_content);
    1.16 -bool mtrr_def_type_msr_set(struct mtrr_state *m, u64 msr_content);
    1.17 -bool mtrr_fix_range_msr_set(struct mtrr_state *m, int row, u64 msr_content);
    1.18 +bool_t mtrr_var_range_msr_set(struct mtrr_state *m, u32 msr, u64 msr_content);
    1.19 +bool_t mtrr_def_type_msr_set(struct mtrr_state *m, u64 msr_content);
    1.20 +bool_t mtrr_fix_range_msr_set(struct mtrr_state *m, int row, u64 msr_content);
    1.21  static void set_var_mtrr(unsigned int reg, struct mtrr_state *m,
    1.22                      unsigned int base, unsigned int size,
    1.23                      unsigned int type)
    1.24 @@ -556,7 +555,7 @@ u32 get_pat_flags(struct vcpu *v,
    1.25  }
    1.26  
    1.27  /* Helper funtions for seting mtrr/pat */
    1.28 -bool pat_msr_set(u64 *pat, u64 msr_content)
    1.29 +bool_t pat_msr_set(u64 *pat, u64 msr_content)
    1.30  {
    1.31      u8 *value = (u8*)&msr_content;
    1.32      int i;
    1.33 @@ -575,7 +574,7 @@ bool pat_msr_set(u64 *pat, u64 msr_conte
    1.34      return 1;
    1.35  }
    1.36  
    1.37 -bool mtrr_def_type_msr_set(struct mtrr_state *m, u64 msr_content)
    1.38 +bool_t mtrr_def_type_msr_set(struct mtrr_state *m, u64 msr_content)
    1.39  {
    1.40      u8 def_type = msr_content & 0xff;
    1.41      u8 enabled = (msr_content >> 10) & 0x3;
    1.42 @@ -600,7 +599,7 @@ bool mtrr_def_type_msr_set(struct mtrr_s
    1.43      return 1;
    1.44  }
    1.45  
    1.46 -bool mtrr_fix_range_msr_set(struct mtrr_state *m, int row, u64 msr_content)
    1.47 +bool_t mtrr_fix_range_msr_set(struct mtrr_state *m, int row, u64 msr_content)
    1.48  {
    1.49      u64 *fixed_range_base = (u64 *)m->fixed_ranges;
    1.50  
    1.51 @@ -623,7 +622,7 @@ bool mtrr_fix_range_msr_set(struct mtrr_
    1.52      return 1;
    1.53  }
    1.54  
    1.55 -bool mtrr_var_range_msr_set(struct mtrr_state *m, u32 msr, u64 msr_content)
    1.56 +bool_t mtrr_var_range_msr_set(struct mtrr_state *m, u32 msr, u64 msr_content)
    1.57  {
    1.58      u32 index;
    1.59      u64 msr_mask;
     2.1 --- a/xen/arch/x86/hvm/vmx/vmx.c	Wed Oct 24 17:15:54 2007 +0100
     2.2 +++ b/xen/arch/x86/hvm/vmx/vmx.c	Wed Oct 24 17:21:17 2007 +0100
     2.3 @@ -50,7 +50,6 @@
     2.4  #include <asm/hvm/vpt.h>
     2.5  #include <public/hvm/save.h>
     2.6  #include <asm/hvm/trace.h>
     2.7 -#include <stdbool.h>
     2.8  
     2.9  enum handler_return { HNDL_done, HNDL_unhandled, HNDL_exception_raised };
    2.10  
    2.11 @@ -2458,12 +2457,12 @@ void vmx_vlapic_msr_changed(struct vcpu 
    2.12      vmx_vmcs_exit(v);
    2.13  }
    2.14  
    2.15 -extern bool mtrr_var_range_msr_set(struct mtrr_state *v,
    2.16 +extern bool_t mtrr_var_range_msr_set(struct mtrr_state *v,
    2.17          u32 msr, u64 msr_content);
    2.18 -extern bool mtrr_fix_range_msr_set(struct mtrr_state *v,
    2.19 +extern bool_t mtrr_fix_range_msr_set(struct mtrr_state *v,
    2.20          int row, u64 msr_content);
    2.21 -extern bool mtrr_def_type_msr_set(struct mtrr_state *v, u64 msr_content);
    2.22 -extern bool pat_msr_set(u64 *pat, u64 msr);
    2.23 +extern bool_t mtrr_def_type_msr_set(struct mtrr_state *v, u64 msr_content);
    2.24 +extern bool_t pat_msr_set(u64 *pat, u64 msr);
    2.25  
    2.26  static int vmx_do_msr_write(struct cpu_user_regs *regs)
    2.27  {