x86: Remove dependency on stdbool.h.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c
index 0c23778cedea72691f528ecf0baf0019ab9cf1e7..a2f26fe063767b448a0270f4b826ba58a74925df 100644 (file)
--- a/xen/arch/x86/hvm/mtrr.c
+++ b/xen/arch/x86/hvm/mtrr.c
@@ -23,7 +23,6 @@
 #include <asm/paging.h>
 #include <asm/p2m.h>
 #include <xen/domain_page.h>
-#include <stdbool.h>
 #include <asm/mtrr.h>
 #include <asm/hvm/support.h>
 #include <asm/hvm/cacheattr.h>
@@ -144,9 +143,9 @@ bool_t is_var_mtrr_overlapped(struct mtrr_state *m)
 #define RESERVED_MTRR 2
 #define MTRRphysBase_MSR(reg) (0x200 + 2 * (reg))
 #define MTRRphysMask_MSR(reg) (0x200 + 2 * (reg) + 1)
-bool mtrr_var_range_msr_set(struct mtrr_state *m, u32 msr, u64 msr_content);
-bool mtrr_def_type_msr_set(struct mtrr_state *m, u64 msr_content);
-bool mtrr_fix_range_msr_set(struct mtrr_state *m, int row, u64 msr_content);
+bool_t mtrr_var_range_msr_set(struct mtrr_state *m, u32 msr, u64 msr_content);
+bool_t mtrr_def_type_msr_set(struct mtrr_state *m, u64 msr_content);
+bool_t mtrr_fix_range_msr_set(struct mtrr_state *m, int row, u64 msr_content);
 static void set_var_mtrr(unsigned int reg, struct mtrr_state *m,
                     unsigned int base, unsigned int size,
                     unsigned int type)
@@ -556,7 +555,7 @@ u32 get_pat_flags(struct vcpu *v,
 }
 
 /* Helper funtions for seting mtrr/pat */
-bool pat_msr_set(u64 *pat, u64 msr_content)
+bool_t pat_msr_set(u64 *pat, u64 msr_content)
 {
     u8 *value = (u8*)&msr_content;
     int i;
@@ -575,7 +574,7 @@ bool pat_msr_set(u64 *pat, u64 msr_content)
     return 1;
 }
 
-bool mtrr_def_type_msr_set(struct mtrr_state *m, u64 msr_content)
+bool_t mtrr_def_type_msr_set(struct mtrr_state *m, u64 msr_content)
 {
     u8 def_type = msr_content & 0xff;
     u8 enabled = (msr_content >> 10) & 0x3;
@@ -600,7 +599,7 @@ bool mtrr_def_type_msr_set(struct mtrr_state *m, u64 msr_content)
     return 1;
 }
 
-bool mtrr_fix_range_msr_set(struct mtrr_state *m, int row, u64 msr_content)
+bool_t mtrr_fix_range_msr_set(struct mtrr_state *m, int row, u64 msr_content)
 {
     u64 *fixed_range_base = (u64 *)m->fixed_ranges;
 
@@ -623,7 +622,7 @@ bool mtrr_fix_range_msr_set(struct mtrr_state *m, int row, u64 msr_content)
     return 1;
 }
 
-bool mtrr_var_range_msr_set(struct mtrr_state *m, u32 msr, u64 msr_content)
+bool_t mtrr_var_range_msr_set(struct mtrr_state *m, u32 msr, u64 msr_content)
 {
     u32 index;
     u64 msr_mask;

diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c
index acbc87511aaae818ad27894183c64f7f674eeb51..75bceb035ff28a4534c609e65aeeb0e8c8826d70 100644 (file)
--- a/xen/arch/x86/hvm/vmx/vmx.c
+++ b/xen/arch/x86/hvm/vmx/vmx.c
@@ -50,7 +50,6 @@
 #include <asm/hvm/vpt.h>
 #include <public/hvm/save.h>
 #include <asm/hvm/trace.h>
-#include <stdbool.h>
 
 enum handler_return { HNDL_done, HNDL_unhandled, HNDL_exception_raised };
 
@@ -2458,12 +2457,12 @@ void vmx_vlapic_msr_changed(struct vcpu *v)
     vmx_vmcs_exit(v);
 }
 
-extern bool mtrr_var_range_msr_set(struct mtrr_state *v,
+extern bool_t mtrr_var_range_msr_set(struct mtrr_state *v,
         u32 msr, u64 msr_content);
-extern bool mtrr_fix_range_msr_set(struct mtrr_state *v,
+extern bool_t mtrr_fix_range_msr_set(struct mtrr_state *v,
         int row, u64 msr_content);
-extern bool mtrr_def_type_msr_set(struct mtrr_state *v, u64 msr_content);
-extern bool pat_msr_set(u64 *pat, u64 msr);
+extern bool_t mtrr_def_type_msr_set(struct mtrr_state *v, u64 msr_content);
+extern bool_t pat_msr_set(u64 *pat, u64 msr);
 
 static int vmx_do_msr_write(struct cpu_user_regs *regs)
 {