From c1450c53d9c82f0cf126454eca92f93158fbb773 Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Thu, 5 Jan 2017 10:26:09 -0600 Subject: [PATCH] x86/mtrr: use stdbool instead of int + define Instead of using an int and providing a define for TRUE and FALSE, change the code to use stdbool that Xen provides. Signed-off-by: Doug Goldstein Reviewed-by: Andrew Cooper [Minor style tweaks] Signed-off-by: Andrew Cooper --- xen/arch/x86/cpu/mtrr/generic.c | 21 +++++++++++---------- xen/arch/x86/cpu/mtrr/mtrr.h | 5 ----- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/cpu/mtrr/generic.c b/xen/arch/x86/cpu/mtrr/generic.c index 234d2ba50b..b7d329303b 100644 --- a/xen/arch/x86/cpu/mtrr/generic.c +++ b/xen/arch/x86/cpu/mtrr/generic.c @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include @@ -237,7 +238,7 @@ static void mtrr_wrmsr(unsigned int msr, uint64_t msr_content) * \param changed pointer which indicates whether the MTRR needed to be changed * \param msrwords pointer to the MSR values which the MSR should have */ -static void set_fixed_range(int msr, int * changed, unsigned int * msrwords) +static void set_fixed_range(int msr, bool *changed, unsigned int *msrwords) { uint64_t msr_content, val; @@ -246,7 +247,7 @@ static void set_fixed_range(int msr, int * changed, unsigned int * msrwords) if (msr_content != val) { mtrr_wrmsr(msr, val); - *changed = TRUE; + *changed = true; } } @@ -302,10 +303,10 @@ static void generic_get_mtrr(unsigned int reg, unsigned long *base, * Checks and updates the fixed-range MTRRs if they differ from the saved set * \param frs pointer to fixed-range MTRR values, saved by get_fixed_ranges() */ -static int set_fixed_ranges(mtrr_type * frs) +static bool set_fixed_ranges(mtrr_type *frs) { unsigned long long *saved = (unsigned long long *) frs; - int changed = FALSE; + bool changed = false; int block=-1, range; while (fixed_range_blocks[++block].ranges) @@ -316,13 +317,13 @@ static int set_fixed_ranges(mtrr_type * frs) return changed; } -/* Set the MSR pair relating to a var range. Returns TRUE if +/* Set the MSR pair relating to a var range. Returns true if changes are made */ -static int set_mtrr_var_ranges(unsigned int index, struct mtrr_var_range *vr) +static bool set_mtrr_var_ranges(unsigned int index, struct mtrr_var_range *vr) { uint32_t lo, hi, base_lo, base_hi, mask_lo, mask_hi; uint64_t msr_content; - int changed = FALSE; + bool changed = false; rdmsrl(MSR_IA32_MTRR_PHYSBASE(index), msr_content); lo = (uint32_t)msr_content; @@ -337,7 +338,7 @@ static int set_mtrr_var_ranges(unsigned int index, struct mtrr_var_range *vr) if ((base_lo != lo) || (base_hi != hi)) { mtrr_wrmsr(MSR_IA32_MTRR_PHYSBASE(index), vr->base); - changed = TRUE; + changed = true; } rdmsrl(MSR_IA32_MTRR_PHYSMASK(index), msr_content); @@ -353,7 +354,7 @@ static int set_mtrr_var_ranges(unsigned int index, struct mtrr_var_range *vr) if ((mask_lo != lo) || (mask_hi != hi)) { mtrr_wrmsr(MSR_IA32_MTRR_PHYSMASK(index), vr->mask); - changed = TRUE; + changed = true; } return changed; } @@ -478,7 +479,7 @@ static void generic_set_mtrr(unsigned int reg, unsigned long base, The base address of the region. The size of the region. If this is 0 the region is disabled. The type of the region. - If TRUE, do the change safely. If FALSE, safety measures should + If true, do the change safely. If false, safety measures should be done externally. [RETURNS] Nothing. */ diff --git a/xen/arch/x86/cpu/mtrr/mtrr.h b/xen/arch/x86/cpu/mtrr/mtrr.h index b41eb58375..53d369d78f 100644 --- a/xen/arch/x86/cpu/mtrr/mtrr.h +++ b/xen/arch/x86/cpu/mtrr/mtrr.h @@ -2,11 +2,6 @@ * local mtrr defines. */ -#ifndef TRUE -#define TRUE 1 -#define FALSE 0 -#endif - #define MTRR_CHANGE_MASK_FIXED 0x01 #define MTRR_CHANGE_MASK_VARIABLE 0x02 #define MTRR_CHANGE_MASK_DEFTYPE 0x04 -- 2.30.2