|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [XEN PATCH 12/13] xen/x86: fixed violations of MISRA C:2012 Rule 7.2
On Tue, 20 Jun 2023, Simone Ballarin wrote:
> From: Gianluca Luparini <gianluca.luparini@xxxxxxxxxxx>
>
> The xen sources contains violations of MISRA C:2012 Rule 7.2 whose headline
> states:
> "A "u" or "U" suffix shall be applied to all integer constants that are
> represented in an unsigned type".
>
> I propose to use "U" as a suffix to explicitly state when an integer constant
> is represented in an unsigned type.
> For homogeneity, I also added the "U" suffix in some cases that the tool
> didn't report as violations.
>
> Signed-off-by: Simone Ballarin <simone.ballarin@xxxxxxxxxxx>
> ---
> xen/arch/x86/apic.c | 2 +-
> xen/arch/x86/cpu-policy.c | 8 +-
> xen/arch/x86/cpu/mcheck/mce-apei.c | 8 +-
> xen/arch/x86/cpuid.c | 8 +-
> xen/arch/x86/efi/efi-boot.h | 6 +-
> xen/arch/x86/hvm/hypercall.c | 2 +-
> xen/arch/x86/hvm/irq.c | 2 +-
> xen/arch/x86/hvm/pmtimer.c | 4 +-
> xen/arch/x86/hvm/stdvga.c | 66 +++---
> xen/arch/x86/hvm/viridian/viridian.c | 2 +-
> xen/arch/x86/hvm/vlapic.c | 6 +-
> xen/arch/x86/include/asm/apicdef.h | 2 +-
> xen/arch/x86/include/asm/config.h | 2 +-
> xen/arch/x86/include/asm/guest/hyperv-tlfs.h | 28 +--
> xen/arch/x86/include/asm/hpet.h | 2 +-
> xen/arch/x86/include/asm/hvm/trace.h | 4 +-
> xen/arch/x86/include/asm/hvm/vioapic.h | 2 +-
> xen/arch/x86/include/asm/msi.h | 2 +-
> xen/arch/x86/include/asm/msr-index.h | 204 +++++++++----------
> xen/arch/x86/include/asm/pci.h | 8 +-
> xen/arch/x86/include/asm/x86-defns.h | 24 +--
> xen/arch/x86/percpu.c | 2 +-
> xen/arch/x86/psr.c | 2 +-
> xen/arch/x86/spec_ctrl.c | 8 +-
> xen/arch/x86/x86_64/acpi_mmcfg.c | 2 +-
> xen/arch/x86/x86_64/pci.c | 2 +-
> xen/arch/x86/x86_emulate/x86_emulate.h | 2 +-
> xen/include/public/arch-x86/xen-x86_64.h | 8 +-
> xen/lib/x86/cpuid.c | 8 +-
> xen/lib/x86/policy.c | 2 +-
> 30 files changed, 214 insertions(+), 214 deletions(-)
>
> diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c
> index f71474d47d..03c5c0f2ee 100644
> --- a/xen/arch/x86/apic.c
> +++ b/xen/arch/x86/apic.c
> @@ -1211,7 +1211,7 @@ static void __init calibrate_APIC_clock(void)
> * Setup the APIC counter to maximum. There is no way the lapic
> * can underflow in the 100ms detection time frame.
> */
> - __setup_APIC_LVTT(0xffffffff);
> + __setup_APIC_LVTT(0xffffffffU);
>
> bus_freq = calibrate_apic_timer();
> if ( !bus_freq )
> diff --git a/xen/arch/x86/cpu-policy.c b/xen/arch/x86/cpu-policy.c
> index f40eeb8be8..5516249cb6 100644
> --- a/xen/arch/x86/cpu-policy.c
> +++ b/xen/arch/x86/cpu-policy.c
> @@ -321,7 +321,7 @@ static void recalculate_misc(struct cpu_policy *p)
> p->extd.vendor_edx = p->basic.vendor_edx;
>
> p->extd.raw_fms = p->basic.raw_fms;
> - p->extd.raw[0x1].b &= 0xff00ffff;
> + p->extd.raw[0x1].b &= 0xff00ffffU;
> p->extd.e1d |= p->basic._1d & CPUID_COMMON_1D_FEATURES;
>
> p->extd.raw[0x8].a &= 0x0000ffff; /* GuestMaxPhysAddr hidden. */
> @@ -378,9 +378,9 @@ static void __init calculate_host_policy(void)
> * this information.
> */
> if ( cpu_has_lfence_dispatch )
> - max_extd_leaf = max(max_extd_leaf, 0x80000021);
> + max_extd_leaf = max(max_extd_leaf, 0x80000021U);
>
> - p->extd.max_leaf = 0x80000000 | min_t(uint32_t, max_extd_leaf & 0xffff,
> + p->extd.max_leaf = 0x80000000U | min_t(uint32_t, max_extd_leaf & 0xffffU,
> ARRAY_SIZE(p->extd.raw) - 1);
>
> x86_cpu_featureset_to_policy(boot_cpu_data.x86_capability, p);
> @@ -768,7 +768,7 @@ void recalculate_cpuid_policy(struct domain *d)
>
> p->basic.max_leaf = min(p->basic.max_leaf, max->basic.max_leaf);
> p->feat.max_subleaf = min(p->feat.max_subleaf, max->feat.max_subleaf);
> - p->extd.max_leaf = 0x80000000 | min(p->extd.max_leaf & 0xffff,
> + p->extd.max_leaf = 0x80000000U | min(p->extd.max_leaf & 0xffff,
> ((p->x86_vendor & (X86_VENDOR_AMD
> |
>
> X86_VENDOR_HYGON))
> ? CPUID_GUEST_NR_EXTD_AMD
> diff --git a/xen/arch/x86/cpu/mcheck/mce-apei.c
> b/xen/arch/x86/cpu/mcheck/mce-apei.c
> index 53b6735896..1aa213b321 100644
> --- a/xen/arch/x86/cpu/mcheck/mce-apei.c
> +++ b/xen/arch/x86/cpu/mcheck/mce-apei.c
> @@ -37,11 +37,11 @@
> #include "mce.h"
>
> #define CPER_CREATOR_MCE \
> - UUID_LE(0x75a574e3, 0x5052, 0x4b29, 0x8a, 0x8e, 0xbe, 0x2c, \
> - 0x64, 0x90, 0xb8, 0x9d)
> + UUID_LE(0x75a574e3U, 0x5052U, 0x4b29U, 0x8aU, 0x8eU, 0xbeU, 0x2cU,
> \
> + 0x64U, 0x90U, 0xb8U, 0x9dU)
> #define CPER_SECTION_TYPE_MCE
> \
> - UUID_LE(0xfe08ffbe, 0x95e4, 0x4be7, 0xbc, 0x73, 0x40, 0x96, \
> - 0x04, 0x4a, 0x38, 0xfc)
> + UUID_LE(0xfe08ffbeU, 0x95e4U, 0x4be7U, 0xbcU, 0x73U, 0x40U, 0x96U,
> \
> + 0x04U, 0x4aU, 0x38U, 0xfcU)
>
> /*
> * CPER specification (in UEFI specification 2.3 appendix N) requires
> diff --git a/xen/arch/x86/cpuid.c b/xen/arch/x86/cpuid.c
> index 455a09b2dd..7290a979c6 100644
> --- a/xen/arch/x86/cpuid.c
> +++ b/xen/arch/x86/cpuid.c
> @@ -93,7 +93,7 @@ void guest_cpuid(const struct vcpu *v, uint32_t leaf,
> }
> break;
>
> - case 0x40000000 ... 0x400000ff:
> + case 0x40000000U ... 0x400000ffU:
> if ( is_viridian_domain(d) )
> return cpuid_viridian_leaves(v, leaf, subleaf, res);
>
> @@ -103,10 +103,10 @@ void guest_cpuid(const struct vcpu *v, uint32_t leaf,
> * Intel reserve up until 0x4fffffff for hypervisor use. AMD reserve
> * only until 0x400000ff, but we already use double that.
> */
> - case 0x40000100 ... 0x400001ff:
> + case 0x40000100U ... 0x400001ffU:
> return cpuid_hypervisor_leaves(v, leaf, subleaf, res);
>
> - case 0x80000000 ... 0x80000000 + CPUID_GUEST_NR_EXTD - 1:
> + case 0x80000000U ... 0x80000000U + CPUID_GUEST_NR_EXTD - 1:
> ASSERT((p->extd.max_leaf & 0xffff) < ARRAY_SIZE(p->extd.raw));
> if ( (leaf & 0xffff) > min_t(uint32_t, p->extd.max_leaf & 0xffff,
> ARRAY_SIZE(p->extd.raw) - 1) )
> @@ -352,7 +352,7 @@ void guest_cpuid(const struct vcpu *v, uint32_t leaf,
> }
> break;
>
> - case 0x80000001:
> + case 0x80000001U:
> /* SYSCALL is hidden outside of long mode on Intel. */
> if ( p->x86_vendor == X86_VENDOR_INTEL &&
> is_hvm_domain(d) && !hvm_long_mode_active(v) )
> diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h
> index c94e53d139..9fe7b06082 100644
> --- a/xen/arch/x86/efi/efi-boot.h
> +++ b/xen/arch/x86/efi/efi-boot.h
> @@ -740,16 +740,16 @@ static void __init efi_arch_handle_module(const struct
> file *file,
>
> static void __init efi_arch_cpu(void)
> {
> - uint32_t eax = cpuid_eax(0x80000000);
> + uint32_t eax = cpuid_eax(0x80000000U);
> uint32_t *caps = boot_cpu_data.x86_capability;
>
> boot_tsc_stamp = rdtsc();
>
> caps[FEATURESET_1c] = cpuid_ecx(1);
>
> - if ( (eax >> 16) == 0x8000 && eax > 0x80000000 )
> + if ( (eax >> 16) == 0x8000 && eax > 0x80000000U )
> {
> - caps[FEATURESET_e1d] = cpuid_edx(0x80000001);
> + caps[FEATURESET_e1d] = cpuid_edx(0x80000001U);
>
> if ( cpu_has_nx )
> trampoline_efer |= EFER_NXE;
> diff --git a/xen/arch/x86/hvm/hypercall.c b/xen/arch/x86/hvm/hypercall.c
> index 20d266ffd5..eeb73e1aa5 100644
> --- a/xen/arch/x86/hvm/hypercall.c
> +++ b/xen/arch/x86/hvm/hypercall.c
> @@ -129,7 +129,7 @@ int hvm_hypercall(struct cpu_user_regs *regs)
> break;
> }
>
> - if ( (eax & 0x80000000) && is_viridian_domain(currd) )
> + if ( (eax & 0x80000000U) && is_viridian_domain(currd) )
> {
> int ret;
>
> diff --git a/xen/arch/x86/hvm/irq.c b/xen/arch/x86/hvm/irq.c
> index 1258371eb0..5c00127cfc 100644
> --- a/xen/arch/x86/hvm/irq.c
> +++ b/xen/arch/x86/hvm/irq.c
> @@ -383,7 +383,7 @@ int hvm_inject_msi(struct domain *d, uint64_t addr,
> uint32_t data)
>
> if ( !vector )
> {
> - int pirq = ((addr >> 32) & 0xffffff00) | dest;
> + int pirq = ((addr >> 32) & 0xffffff00U) | dest;
>
> if ( pirq > 0 )
> {
> diff --git a/xen/arch/x86/hvm/pmtimer.c b/xen/arch/x86/hvm/pmtimer.c
> index 2145c531b6..eb4a455763 100644
> --- a/xen/arch/x86/hvm/pmtimer.c
> +++ b/xen/arch/x86/hvm/pmtimer.c
> @@ -40,8 +40,8 @@
> #define SCI_IRQ 9
>
> /* We provide a 32-bit counter (must match the TMR_VAL_EXT bit in the FADT)
> */
> -#define TMR_VAL_MASK (0xffffffff)
> -#define TMR_VAL_MSB (0x80000000)
> +#define TMR_VAL_MASK (0xffffffffU)
> +#define TMR_VAL_MSB (0x80000000U)
>
> /* Dispatch SCIs based on the PM1a_STS and PM1a_EN registers */
> static void pmt_update_sci(PMTState *s)
> diff --git a/xen/arch/x86/hvm/stdvga.c b/xen/arch/x86/hvm/stdvga.c
> index 798a9a0549..52efa8348a 100644
> --- a/xen/arch/x86/hvm/stdvga.c
> +++ b/xen/arch/x86/hvm/stdvga.c
> @@ -39,46 +39,46 @@
>
> #define PAT(x) (x)
> static const uint32_t mask16[16] = {
> - PAT(0x00000000),
> - PAT(0x000000ff),
> - PAT(0x0000ff00),
> - PAT(0x0000ffff),
> - PAT(0x00ff0000),
> - PAT(0x00ff00ff),
> - PAT(0x00ffff00),
> - PAT(0x00ffffff),
> - PAT(0xff000000),
> - PAT(0xff0000ff),
> - PAT(0xff00ff00),
> - PAT(0xff00ffff),
> - PAT(0xffff0000),
> - PAT(0xffff00ff),
> - PAT(0xffffff00),
> - PAT(0xffffffff),
> + PAT(0x00000000U),
> + PAT(0x000000ffU),
> + PAT(0x0000ff00U),
> + PAT(0x0000ffffU),
> + PAT(0x00ff0000U),
> + PAT(0x00ff00ffU),
> + PAT(0x00ffff00U),
> + PAT(0x00ffffffU),
> + PAT(0xff000000U),
> + PAT(0xff0000ffU),
> + PAT(0xff00ff00U),
> + PAT(0xff00ffffU),
> + PAT(0xffff0000U),
> + PAT(0xffff00ffU),
> + PAT(0xffffff00U),
> + PAT(0xffffffffU),
> };
>
> /* force some bits to zero */
> static const uint8_t sr_mask[8] = {
> - (uint8_t)~0xfc,
> - (uint8_t)~0xc2,
> - (uint8_t)~0xf0,
> - (uint8_t)~0xc0,
> - (uint8_t)~0xf1,
> - (uint8_t)~0xff,
> - (uint8_t)~0xff,
> - (uint8_t)~0x00,
> + (uint8_t)~0xfcU,
> + (uint8_t)~0xc2U,
> + (uint8_t)~0xf0U,
> + (uint8_t)~0xc0U,
> + (uint8_t)~0xf1U,
> + (uint8_t)~0xffU,
> + (uint8_t)~0xffU,
> + (uint8_t)~0x00U,
> };
>
> static const uint8_t gr_mask[9] = {
> - (uint8_t)~0xf0, /* 0x00 */
> - (uint8_t)~0xf0, /* 0x01 */
> - (uint8_t)~0xf0, /* 0x02 */
> - (uint8_t)~0xe0, /* 0x03 */
> - (uint8_t)~0xfc, /* 0x04 */
> - (uint8_t)~0x84, /* 0x05 */
> - (uint8_t)~0xf0, /* 0x06 */
> - (uint8_t)~0xf0, /* 0x07 */
> - (uint8_t)~0x00, /* 0x08 */
> + (uint8_t)~0xf0U, /* 0x00 */
> + (uint8_t)~0xf0U, /* 0x01 */
> + (uint8_t)~0xf0U, /* 0x02 */
> + (uint8_t)~0xe0U, /* 0x03 */
> + (uint8_t)~0xfcU, /* 0x04 */
> + (uint8_t)~0x84U, /* 0x05 */
> + (uint8_t)~0xf0U, /* 0x06 */
> + (uint8_t)~0xf0U, /* 0x07 */
> + (uint8_t)~0x00U, /* 0x08 */
> };
>
> static uint8_t *vram_getb(struct hvm_hw_stdvga *s, unsigned int a)
> diff --git a/xen/arch/x86/hvm/viridian/viridian.c
> b/xen/arch/x86/hvm/viridian/viridian.c
> index 7405c117bc..61171e3363 100644
> --- a/xen/arch/x86/hvm/viridian/viridian.c
> +++ b/xen/arch/x86/hvm/viridian/viridian.c
> @@ -291,7 +291,7 @@ static void enable_hypercall_page(struct domain *d)
> * calling convention) to differentiate Xen and Viridian hypercalls.
> */
> *(u8 *)(p + 0) = 0x0d; /* orl $0x80000000, %eax */
> - *(u32 *)(p + 1) = 0x80000000;
> + *(u32 *)(p + 1) = 0x80000000U;
> *(u8 *)(p + 5) = 0x0f; /* vmcall/vmmcall */
> *(u8 *)(p + 6) = 0x01;
> *(u8 *)(p + 7) = (cpu_has_vmx ? 0xc1 : 0xd9);
> diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c
> index 785d5d88d9..04009007dd 100644
> --- a/xen/arch/x86/hvm/vlapic.c
> +++ b/xen/arch/x86/hvm/vlapic.c
> @@ -237,7 +237,7 @@ bool_t vlapic_match_dest(
> case APIC_DEST_NOSHORT:
> if ( dest_mode )
> return vlapic_match_logical_addr(target, dest);
> - return (dest == _VLAPIC_ID(target, 0xffffffff)) ||
> + return (dest == _VLAPIC_ID(target, 0xffffffffU)) ||
> (dest == VLAPIC_ID(target));
>
> case APIC_DEST_SELF:
> @@ -467,7 +467,7 @@ static bool_t is_multicast_dest(struct vlapic *vlapic,
> unsigned int short_hand,
> return short_hand != APIC_DEST_SELF;
>
> if ( vlapic_x2apic_mode(vlapic) )
> - return dest_mode ? hweight16(dest) > 1 : dest == 0xffffffff;
> + return dest_mode ? hweight16(dest) > 1 : dest == 0xffffffffU;
>
> if ( dest_mode )
> return hweight8(dest &
> @@ -831,7 +831,7 @@ void vlapic_reg_write(struct vcpu *v, unsigned int reg,
> uint32_t val)
> break;
>
> case APIC_ICR2:
> - vlapic_set_reg(vlapic, APIC_ICR2, val & 0xff000000);
> + vlapic_set_reg(vlapic, APIC_ICR2, val & 0xff000000U);
> break;
>
> case APIC_LVTT: /* LVT Timer Reg */
> diff --git a/xen/arch/x86/include/asm/apicdef.h
> b/xen/arch/x86/include/asm/apicdef.h
> index 2440d83c8d..7f21d3f49c 100644
> --- a/xen/arch/x86/include/asm/apicdef.h
> +++ b/xen/arch/x86/include/asm/apicdef.h
> @@ -8,7 +8,7 @@
> * Ingo Molnar <mingo@xxxxxxxxxx>, 1999, 2000
> */
>
> -#define APIC_DEFAULT_PHYS_BASE 0xfee00000
> +#define APIC_DEFAULT_PHYS_BASE 0xfee00000U
>
> #define APIC_ID 0x20
> #define APIC_ID_MASK (0xFFu<<24)
> diff --git a/xen/arch/x86/include/asm/config.h
> b/xen/arch/x86/include/asm/config.h
> index fbc4bb3416..bbced338be 100644
> --- a/xen/arch/x86/include/asm/config.h
> +++ b/xen/arch/x86/include/asm/config.h
> @@ -257,7 +257,7 @@ extern unsigned char boot_edid_info[128];
> #endif /* CONFIG_PV32 */
>
> #define MACH2PHYS_COMPAT_VIRT_START HYPERVISOR_COMPAT_VIRT_START
> -#define MACH2PHYS_COMPAT_VIRT_END 0xFFE00000
> +#define MACH2PHYS_COMPAT_VIRT_END 0xFFE00000U
> #define MACH2PHYS_COMPAT_NR_ENTRIES(d) \
> ((MACH2PHYS_COMPAT_VIRT_END-MACH2PHYS_COMPAT_VIRT_START(d))>>2)
>
> diff --git a/xen/arch/x86/include/asm/guest/hyperv-tlfs.h
> b/xen/arch/x86/include/asm/guest/hyperv-tlfs.h
> index 38f997a0c8..a6915ad731 100644
> --- a/xen/arch/x86/include/asm/guest/hyperv-tlfs.h
> +++ b/xen/arch/x86/include/asm/guest/hyperv-tlfs.h
> @@ -471,30 +471,30 @@ typedef struct _HV_REFERENCE_TSC_PAGE {
>
> /* Define hypervisor message types. */
> enum hv_message_type {
> - HVMSG_NONE = 0x00000000,
> + HVMSG_NONE = 0x00000000U,
>
> /* Memory access messages. */
> - HVMSG_UNMAPPED_GPA = 0x80000000,
> - HVMSG_GPA_INTERCEPT = 0x80000001,
> + HVMSG_UNMAPPED_GPA = 0x80000000U,
> + HVMSG_GPA_INTERCEPT = 0x80000001U,
>
> /* Timer notification messages. */
> - HVMSG_TIMER_EXPIRED = 0x80000010,
> + HVMSG_TIMER_EXPIRED = 0x80000010U,
>
> /* Error messages. */
> - HVMSG_INVALID_VP_REGISTER_VALUE = 0x80000020,
> - HVMSG_UNRECOVERABLE_EXCEPTION = 0x80000021,
> - HVMSG_UNSUPPORTED_FEATURE = 0x80000022,
> + HVMSG_INVALID_VP_REGISTER_VALUE = 0x80000020U,
> + HVMSG_UNRECOVERABLE_EXCEPTION = 0x80000021U,
> + HVMSG_UNSUPPORTED_FEATURE = 0x80000022U,
>
> /* Trace buffer complete messages. */
> - HVMSG_EVENTLOG_BUFFERCOMPLETE = 0x80000040,
> + HVMSG_EVENTLOG_BUFFERCOMPLETE = 0x80000040U,
>
> /* Platform-specific processor intercept messages. */
> - HVMSG_X64_IOPORT_INTERCEPT = 0x80010000,
> - HVMSG_X64_MSR_INTERCEPT = 0x80010001,
> - HVMSG_X64_CPUID_INTERCEPT = 0x80010002,
> - HVMSG_X64_EXCEPTION_INTERCEPT = 0x80010003,
> - HVMSG_X64_APIC_EOI = 0x80010004,
> - HVMSG_X64_LEGACY_FP_ERROR = 0x80010005
> + HVMSG_X64_IOPORT_INTERCEPT = 0x80010000U,
> + HVMSG_X64_MSR_INTERCEPT = 0x80010001U,
> + HVMSG_X64_CPUID_INTERCEPT = 0x80010002U,
> + HVMSG_X64_EXCEPTION_INTERCEPT = 0x80010003U,
> + HVMSG_X64_APIC_EOI = 0x80010004U,
> + HVMSG_X64_LEGACY_FP_ERROR = 0x80010005U
> };
>
> /* Define synthetic interrupt controller message flags. */
> diff --git a/xen/arch/x86/include/asm/hpet.h b/xen/arch/x86/include/asm/hpet.h
> index 9919f74730..c5e8e9c8db 100644
> --- a/xen/arch/x86/include/asm/hpet.h
> +++ b/xen/arch/x86/include/asm/hpet.h
> @@ -41,7 +41,7 @@
> #define HPET_TN_ROUTE 0x3e00
> #define HPET_TN_FSB 0x4000
> #define HPET_TN_FSB_CAP 0x8000
> -#define HPET_TN_RESERVED 0xffff0081
> +#define HPET_TN_RESERVED 0xffff0081U
> #define HPET_TN_INT_ROUTE_CAP (0xffffffffULL << 32)
>
>
> diff --git a/xen/arch/x86/include/asm/hvm/trace.h
> b/xen/arch/x86/include/asm/hvm/trace.h
> index 696e42eb94..60b88b9c1f 100644
> --- a/xen/arch/x86/include/asm/hvm/trace.h
> +++ b/xen/arch/x86/include/asm/hvm/trace.h
> @@ -58,7 +58,7 @@
> #define DO_TRC_HVM_VLAPIC DEFAULT_HVM_MISC
>
>
> -#define TRC_PAR_LONG(par) ((par)&0xFFFFFFFF),((par)>>32)
> +#define TRC_PAR_LONG(par) ((par)&0xFFFFFFFFU),((par)>>32)
>
> #define TRACE_2_LONG_2D(_e, d1, d2, ...) \
> TRACE_4D(_e, d1, d2)
> @@ -93,7 +93,7 @@
> HVMTRACE_ND(evt, 0, 0)
>
> #define HVMTRACE_LONG_1D(evt, d1) \
> - HVMTRACE_2D(evt ## 64, (d1) & 0xFFFFFFFF, (d1) >> 32)
> + HVMTRACE_2D(evt ## 64, (d1) & 0xFFFFFFFFU, (d1) >> 32)
> #define HVMTRACE_LONG_2D(evt, d1, d2, ...) \
> HVMTRACE_3D(evt ## 64, d1, d2)
> #define HVMTRACE_LONG_3D(evt, d1, d2, d3, ...) \
> diff --git a/xen/arch/x86/include/asm/hvm/vioapic.h
> b/xen/arch/x86/include/asm/hvm/vioapic.h
> index 2944ec20dd..68af6dce79 100644
> --- a/xen/arch/x86/include/asm/hvm/vioapic.h
> +++ b/xen/arch/x86/include/asm/hvm/vioapic.h
> @@ -32,7 +32,7 @@
> #define VIOAPIC_EDGE_TRIG 0
> #define VIOAPIC_LEVEL_TRIG 1
>
> -#define VIOAPIC_DEFAULT_BASE_ADDRESS 0xfec00000
> +#define VIOAPIC_DEFAULT_BASE_ADDRESS 0xfec00000U
> #define VIOAPIC_MEM_LENGTH 0x100
>
> /* Direct registers. */
> diff --git a/xen/arch/x86/include/asm/msi.h b/xen/arch/x86/include/asm/msi.h
> index a53ade95c9..d89723d009 100644
> --- a/xen/arch/x86/include/asm/msi.h
> +++ b/xen/arch/x86/include/asm/msi.h
> @@ -37,7 +37,7 @@
> */
>
> #define MSI_ADDR_BASE_HI 0
> -#define MSI_ADDR_BASE_LO 0xfee00000
> +#define MSI_ADDR_BASE_LO 0xfee00000U
> #define MSI_ADDR_BASE_MASK (~0xfffff)
> #define MSI_ADDR_HEADER MSI_ADDR_BASE_LO
>
> diff --git a/xen/arch/x86/include/asm/msr-index.h
> b/xen/arch/x86/include/asm/msr-index.h
> index 2749e433d2..7ed48d23cd 100644
> --- a/xen/arch/x86/include/asm/msr-index.h
> +++ b/xen/arch/x86/include/asm/msr-index.h
> @@ -30,7 +30,7 @@
>
> #define MSR_INTEL_CORE_THREAD_COUNT 0x00000035
> #define MSR_CTC_THREAD_MASK 0x0000ffff
> -#define MSR_CTC_CORE_MASK 0xffff0000
> +#define MSR_CTC_CORE_MASK 0xffff0000U
>
> #define MSR_SPEC_CTRL 0x00000048
> #define SPEC_CTRL_IBRS (_AC(1, ULL) << 0)
> @@ -168,7 +168,7 @@
> #define MSR_UARCH_MISC_CTRL 0x00001b01
> #define UARCH_CTRL_DOITM (_AC(1, ULL) << 0)
>
> -#define MSR_EFER 0xc0000080 /* Extended Feature
> Enable Register */
> +#define MSR_EFER 0xc0000080U /* Extended Feature
> Enable Register */
> #define EFER_SCE (_AC(1, ULL) << 0) /* SYSCALL
> Enable */
> #define EFER_LME (_AC(1, ULL) << 8) /* Long Mode
> Enable */
> #define EFER_LMA (_AC(1, ULL) << 10) /* Long Mode
> Active */
> @@ -181,35 +181,35 @@
> (EFER_SCE | EFER_LME | EFER_LMA | EFER_NXE | EFER_SVME | EFER_FFXSE | \
> EFER_AIBRSE)
>
> -#define MSR_STAR 0xc0000081 /* legacy mode
> SYSCALL target */
> -#define MSR_LSTAR 0xc0000082 /* long mode SYSCALL
> target */
> -#define MSR_CSTAR 0xc0000083 /* compat mode
> SYSCALL target */
> -#define MSR_SYSCALL_MASK 0xc0000084 /* EFLAGS mask for
> syscall */
> -#define MSR_FS_BASE 0xc0000100 /* 64bit FS base */
> -#define MSR_GS_BASE 0xc0000101 /* 64bit GS base */
> -#define MSR_SHADOW_GS_BASE 0xc0000102 /* SwapGS GS shadow */
> -#define MSR_TSC_AUX 0xc0000103 /* Auxiliary TSC */
> +#define MSR_STAR 0xc0000081U /* legacy mode
> SYSCALL target */
> +#define MSR_LSTAR 0xc0000082U /* long mode SYSCALL
> target */
> +#define MSR_CSTAR 0xc0000083U /* compat mode
> SYSCALL target */
> +#define MSR_SYSCALL_MASK 0xc0000084U /* EFLAGS mask for
> syscall */
> +#define MSR_FS_BASE 0xc0000100U /* 64bit FS base */
> +#define MSR_GS_BASE 0xc0000101U /* 64bit GS base */
> +#define MSR_SHADOW_GS_BASE 0xc0000102U /* SwapGS GS shadow
> */
> +#define MSR_TSC_AUX 0xc0000103U /* Auxiliary TSC */
>
> -#define MSR_K8_SYSCFG 0xc0010010
> +#define MSR_K8_SYSCFG 0xc0010010U
> #define SYSCFG_MTRR_FIX_DRAM_EN (_AC(1, ULL) << 18)
> #define SYSCFG_MTRR_FIX_DRAM_MOD_EN (_AC(1, ULL) << 19)
> #define SYSCFG_MTRR_VAR_DRAM_EN (_AC(1, ULL) << 20)
> #define SYSCFG_MTRR_TOM2_EN (_AC(1, ULL) << 21)
> #define SYSCFG_TOM2_FORCE_WB (_AC(1, ULL) << 22)
>
> -#define MSR_K8_IORR_BASE0 0xc0010016
> -#define MSR_K8_IORR_MASK0 0xc0010017
> -#define MSR_K8_IORR_BASE1 0xc0010018
> -#define MSR_K8_IORR_MASK1 0xc0010019
> +#define MSR_K8_IORR_BASE0 0xc0010016U
> +#define MSR_K8_IORR_MASK0 0xc0010017U
> +#define MSR_K8_IORR_BASE1 0xc0010018U
> +#define MSR_K8_IORR_MASK1 0xc0010019U
>
> -#define MSR_K8_TSEG_BASE 0xc0010112 /* AMD doc: SMMAddr */
> -#define MSR_K8_TSEG_MASK 0xc0010113 /* AMD doc: SMMMask */
> +#define MSR_K8_TSEG_BASE 0xc0010112U /* AMD doc: SMMAddr
> */
> +#define MSR_K8_TSEG_MASK 0xc0010113U /* AMD doc: SMMMask
> */
>
> -#define MSR_K8_VM_CR 0xc0010114
> +#define MSR_K8_VM_CR 0xc0010114U
> #define VM_CR_INIT_REDIRECTION (_AC(1, ULL) << 1)
> #define VM_CR_SVM_DISABLE (_AC(1, ULL) << 4)
>
> -#define MSR_VIRT_SPEC_CTRL 0xc001011f /* Layout matches
> MSR_SPEC_CTRL */
> +#define MSR_VIRT_SPEC_CTRL 0xc001011fU /* Layout matches
> MSR_SPEC_CTRL */
>
> /*
> * Legacy MSR constants in need of cleanup. No new MSRs below this comment.
> @@ -293,7 +293,7 @@
> #define CMCI_EN (1UL<<30)
> #define CMCI_THRESHOLD_MASK 0x7FFF
>
> -#define MSR_AMD64_MC0_MASK 0xc0010044
> +#define MSR_AMD64_MC0_MASK 0xc0010044U
>
> #define MSR_IA32_MCx_CTL(x) (MSR_IA32_MC0_CTL + 4*(x))
> #define MSR_IA32_MCx_STATUS(x) (MSR_IA32_MC0_STATUS + 4*(x))
> @@ -325,83 +325,83 @@
>
> /* K7/K8 MSRs. Not complete. See the architecture manual for a more
> complete list. */
> -#define MSR_K7_EVNTSEL0 0xc0010000
> -#define MSR_K7_PERFCTR0 0xc0010004
> -#define MSR_K7_EVNTSEL1 0xc0010001
> -#define MSR_K7_PERFCTR1 0xc0010005
> -#define MSR_K7_EVNTSEL2 0xc0010002
> -#define MSR_K7_PERFCTR2 0xc0010006
> -#define MSR_K7_EVNTSEL3 0xc0010003
> -#define MSR_K7_PERFCTR3 0xc0010007
> -#define MSR_K8_TOP_MEM1 0xc001001a
> -#define MSR_K7_CLK_CTL 0xc001001b
> -#define MSR_K8_TOP_MEM2 0xc001001d
> -
> -#define MSR_K8_HWCR 0xc0010015
> +#define MSR_K7_EVNTSEL0 0xc0010000U
> +#define MSR_K7_PERFCTR0 0xc0010004U
> +#define MSR_K7_EVNTSEL1 0xc0010001U
> +#define MSR_K7_PERFCTR1 0xc0010005U
> +#define MSR_K7_EVNTSEL2 0xc0010002U
> +#define MSR_K7_PERFCTR2 0xc0010006U
> +#define MSR_K7_EVNTSEL3 0xc0010003U
> +#define MSR_K7_PERFCTR3 0xc0010007U
> +#define MSR_K8_TOP_MEM1 0xc001001aU
> +#define MSR_K7_CLK_CTL 0xc001001bU
> +#define MSR_K8_TOP_MEM2 0xc001001dU
> +
> +#define MSR_K8_HWCR 0xc0010015U
> #define K8_HWCR_TSC_FREQ_SEL (1ULL << 24)
> #define K8_HWCR_CPUID_USER_DIS (1ULL << 35)
>
> -#define MSR_K7_FID_VID_CTL 0xc0010041
> -#define MSR_K7_FID_VID_STATUS 0xc0010042
> -#define MSR_K8_PSTATE_LIMIT 0xc0010061
> -#define MSR_K8_PSTATE_CTRL 0xc0010062
> -#define MSR_K8_PSTATE_STATUS 0xc0010063
> -#define MSR_K8_PSTATE0 0xc0010064
> -#define MSR_K8_PSTATE1 0xc0010065
> -#define MSR_K8_PSTATE2 0xc0010066
> -#define MSR_K8_PSTATE3 0xc0010067
> -#define MSR_K8_PSTATE4 0xc0010068
> -#define MSR_K8_PSTATE5 0xc0010069
> -#define MSR_K8_PSTATE6 0xc001006A
> -#define MSR_K8_PSTATE7 0xc001006B
> -#define MSR_K8_ENABLE_C1E 0xc0010055
> -#define MSR_K8_VM_HSAVE_PA 0xc0010117
> -
> -#define MSR_AMD_FAM15H_EVNTSEL0 0xc0010200
> -#define MSR_AMD_FAM15H_PERFCTR0 0xc0010201
> -#define MSR_AMD_FAM15H_EVNTSEL1 0xc0010202
> -#define MSR_AMD_FAM15H_PERFCTR1 0xc0010203
> -#define MSR_AMD_FAM15H_EVNTSEL2 0xc0010204
> -#define MSR_AMD_FAM15H_PERFCTR2 0xc0010205
> -#define MSR_AMD_FAM15H_EVNTSEL3 0xc0010206
> -#define MSR_AMD_FAM15H_PERFCTR3 0xc0010207
> -#define MSR_AMD_FAM15H_EVNTSEL4 0xc0010208
> -#define MSR_AMD_FAM15H_PERFCTR4 0xc0010209
> -#define MSR_AMD_FAM15H_EVNTSEL5 0xc001020a
> -#define MSR_AMD_FAM15H_PERFCTR5 0xc001020b
> -
> -#define MSR_AMD_L7S0_FEATURE_MASK 0xc0011002
> -#define MSR_AMD_THRM_FEATURE_MASK 0xc0011003
> -#define MSR_K8_FEATURE_MASK 0xc0011004
> -#define MSR_K8_EXT_FEATURE_MASK 0xc0011005
> +#define MSR_K7_FID_VID_CTL 0xc0010041U
> +#define MSR_K7_FID_VID_STATUS 0xc0010042U
> +#define MSR_K8_PSTATE_LIMIT 0xc0010061U
> +#define MSR_K8_PSTATE_CTRL 0xc0010062U
> +#define MSR_K8_PSTATE_STATUS 0xc0010063U
> +#define MSR_K8_PSTATE0 0xc0010064U
> +#define MSR_K8_PSTATE1 0xc0010065U
> +#define MSR_K8_PSTATE2 0xc0010066U
> +#define MSR_K8_PSTATE3 0xc0010067U
> +#define MSR_K8_PSTATE4 0xc0010068U
> +#define MSR_K8_PSTATE5 0xc0010069U
> +#define MSR_K8_PSTATE6 0xc001006AU
> +#define MSR_K8_PSTATE7 0xc001006BU
> +#define MSR_K8_ENABLE_C1E 0xc0010055U
> +#define MSR_K8_VM_HSAVE_PA 0xc0010117U
> +
> +#define MSR_AMD_FAM15H_EVNTSEL0 0xc0010200U
> +#define MSR_AMD_FAM15H_PERFCTR0 0xc0010201U
> +#define MSR_AMD_FAM15H_EVNTSEL1 0xc0010202U
> +#define MSR_AMD_FAM15H_PERFCTR1 0xc0010203U
> +#define MSR_AMD_FAM15H_EVNTSEL2 0xc0010204U
> +#define MSR_AMD_FAM15H_PERFCTR2 0xc0010205U
> +#define MSR_AMD_FAM15H_EVNTSEL3 0xc0010206U
> +#define MSR_AMD_FAM15H_PERFCTR3 0xc0010207U
> +#define MSR_AMD_FAM15H_EVNTSEL4 0xc0010208U
> +#define MSR_AMD_FAM15H_PERFCTR4 0xc0010209U
> +#define MSR_AMD_FAM15H_EVNTSEL5 0xc001020aU
> +#define MSR_AMD_FAM15H_PERFCTR5 0xc001020bU
> +
> +#define MSR_AMD_L7S0_FEATURE_MASK 0xc0011002U
> +#define MSR_AMD_THRM_FEATURE_MASK 0xc0011003U
> +#define MSR_K8_FEATURE_MASK 0xc0011004U
> +#define MSR_K8_EXT_FEATURE_MASK 0xc0011005U
>
> /* AMD64 MSRs */
> -#define MSR_AMD64_NB_CFG 0xc001001f
> +#define MSR_AMD64_NB_CFG 0xc001001fU
> #define AMD64_NB_CFG_CF8_EXT_ENABLE_BIT 46
> -#define MSR_AMD64_LS_CFG 0xc0011020
> -#define MSR_AMD64_IC_CFG 0xc0011021
> -#define MSR_AMD64_DC_CFG 0xc0011022
> -#define MSR_AMD64_DE_CFG 0xc0011029
> +#define MSR_AMD64_LS_CFG 0xc0011020U
> +#define MSR_AMD64_IC_CFG 0xc0011021U
> +#define MSR_AMD64_DC_CFG 0xc0011022U
> +#define MSR_AMD64_DE_CFG 0xc0011029U
> #define AMD64_DE_CFG_LFENCE_SERIALISE (_AC(1, ULL) << 1)
> -#define MSR_AMD64_EX_CFG 0xc001102c
> -#define MSR_AMD64_DE_CFG2 0xc00110e3
> +#define MSR_AMD64_EX_CFG 0xc001102cU
> +#define MSR_AMD64_DE_CFG2 0xc00110e3U
>
> -#define MSR_AMD64_DR0_ADDRESS_MASK 0xc0011027
> -#define MSR_AMD64_DR1_ADDRESS_MASK 0xc0011019
> -#define MSR_AMD64_DR2_ADDRESS_MASK 0xc001101a
> -#define MSR_AMD64_DR3_ADDRESS_MASK 0xc001101b
> +#define MSR_AMD64_DR0_ADDRESS_MASK 0xc0011027U
> +#define MSR_AMD64_DR1_ADDRESS_MASK 0xc0011019U
> +#define MSR_AMD64_DR2_ADDRESS_MASK 0xc001101aU
> +#define MSR_AMD64_DR3_ADDRESS_MASK 0xc001101bU
>
> /* AMD Family10h machine check MSRs */
> -#define MSR_F10_MC4_MISC1 0xc0000408
> -#define MSR_F10_MC4_MISC2 0xc0000409
> -#define MSR_F10_MC4_MISC3 0xc000040A
> +#define MSR_F10_MC4_MISC1 0xc0000408U
> +#define MSR_F10_MC4_MISC2 0xc0000409U
> +#define MSR_F10_MC4_MISC3 0xc000040AU
>
> /* AMD Family10h Bus Unit MSRs */
> -#define MSR_F10_BU_CFG 0xc0011023
> -#define MSR_F10_BU_CFG2 0xc001102a
> +#define MSR_F10_BU_CFG 0xc0011023U
> +#define MSR_F10_BU_CFG2 0xc001102aU
>
> /* Other AMD Fam10h MSRs */
> -#define MSR_FAM10H_MMIO_CONF_BASE 0xc0010058
> +#define MSR_FAM10H_MMIO_CONF_BASE 0xc0010058U
> #define FAM10H_MMIO_CONF_ENABLE (1<<0)
> #define FAM10H_MMIO_CONF_BUSRANGE_MASK 0xf
> #define FAM10H_MMIO_CONF_BUSRANGE_SHIFT 2
> @@ -410,31 +410,31 @@
>
> /* AMD Microcode MSRs */
> #define MSR_AMD_PATCHLEVEL 0x0000008b
> -#define MSR_AMD_PATCHLOADER 0xc0010020
> +#define MSR_AMD_PATCHLOADER 0xc0010020U
>
> /* AMD TSC RATE MSR */
> -#define MSR_AMD64_TSC_RATIO 0xc0000104
> +#define MSR_AMD64_TSC_RATIO 0xc0000104U
>
> /* AMD Lightweight Profiling MSRs */
> -#define MSR_AMD64_LWP_CFG 0xc0000105
> -#define MSR_AMD64_LWP_CBADDR 0xc0000106
> +#define MSR_AMD64_LWP_CFG 0xc0000105U
> +#define MSR_AMD64_LWP_CBADDR 0xc0000106U
>
> /* AMD OS Visible Workaround MSRs */
> -#define MSR_AMD_OSVW_ID_LENGTH 0xc0010140
> -#define MSR_AMD_OSVW_STATUS 0xc0010141
> +#define MSR_AMD_OSVW_ID_LENGTH 0xc0010140U
> +#define MSR_AMD_OSVW_STATUS 0xc0010141U
>
> /* AMD Protected Processor Inventory Number */
> -#define MSR_AMD_PPIN_CTL 0xc00102f0
> -#define MSR_AMD_PPIN 0xc00102f1
> +#define MSR_AMD_PPIN_CTL 0xc00102f0U
> +#define MSR_AMD_PPIN 0xc00102f1U
>
> /* K6 MSRs */
> -#define MSR_K6_EFER 0xc0000080
> -#define MSR_K6_STAR 0xc0000081
> -#define MSR_K6_WHCR 0xc0000082
> -#define MSR_K6_UWCCR 0xc0000085
> -#define MSR_K6_EPMR 0xc0000086
> -#define MSR_K6_PSOR 0xc0000087
> -#define MSR_K6_PFIR 0xc0000088
> +#define MSR_K6_EFER 0xc0000080U
> +#define MSR_K6_STAR 0xc0000081U
> +#define MSR_K6_WHCR 0xc0000082U
> +#define MSR_K6_UWCCR 0xc0000085U
> +#define MSR_K6_EPMR 0xc0000086U
> +#define MSR_K6_PSOR 0xc0000087U
> +#define MSR_K6_PFIR 0xc0000088U
>
> /* Centaur-Hauls/IDT defined MSRs. */
> #define MSR_IDT_FCR1 0x00000107
> @@ -459,10 +459,10 @@
> #define MSR_VIA_BCR2 0x00001147
>
> /* Transmeta defined MSRs */
> -#define MSR_TMTA_LONGRUN_CTRL 0x80868010
> -#define MSR_TMTA_LONGRUN_FLAGS 0x80868011
> -#define MSR_TMTA_LRTI_READOUT 0x80868018
> -#define MSR_TMTA_LRTI_VOLT_MHZ 0x8086801a
> +#define MSR_TMTA_LONGRUN_CTRL 0x80868010U
> +#define MSR_TMTA_LONGRUN_FLAGS 0x80868011U
> +#define MSR_TMTA_LRTI_READOUT 0x80868018U
> +#define MSR_TMTA_LRTI_VOLT_MHZ 0x8086801aU
>
> /* Intel defined MSRs. */
> #define MSR_IA32_P5_MC_ADDR 0x00000000
> diff --git a/xen/arch/x86/include/asm/pci.h b/xen/arch/x86/include/asm/pci.h
> index f4a58c8acf..e1dd12eb19 100644
> --- a/xen/arch/x86/include/asm/pci.h
> +++ b/xen/arch/x86/include/asm/pci.h
> @@ -3,10 +3,10 @@
>
> #include <xen/mm.h>
>
> -#define CF8_BDF(cf8) ( ((cf8) & 0x00ffff00) >> 8)
> -#define CF8_ADDR_LO(cf8) ( (cf8) & 0x000000fc)
> -#define CF8_ADDR_HI(cf8) ( ((cf8) & 0x0f000000) >> 16)
> -#define CF8_ENABLED(cf8) (!!((cf8) & 0x80000000))
> +#define CF8_BDF(cf8) ( ((cf8) & 0x00ffff00U) >> 8)
> +#define CF8_ADDR_LO(cf8) ( (cf8) & 0x000000fcU)
> +#define CF8_ADDR_HI(cf8) ( ((cf8) & 0x0f000000U) >> 16)
> +#define CF8_ENABLED(cf8) (!!((cf8) & 0x80000000U))
>
> #define IS_SNB_GFX(id) (id == 0x01068086 || id == 0x01168086 \
> || id == 0x01268086 || id == 0x01028086 \
> diff --git a/xen/arch/x86/include/asm/x86-defns.h
> b/xen/arch/x86/include/asm/x86-defns.h
> index e350227e57..87173abc70 100644
> --- a/xen/arch/x86/include/asm/x86-defns.h
> +++ b/xen/arch/x86/include/asm/x86-defns.h
> @@ -30,17 +30,17 @@
> /*
> * Intel CPU flags in CR0
> */
> -#define X86_CR0_PE 0x00000001 /* Enable Protected Mode (RW)
> */
> -#define X86_CR0_MP 0x00000002 /* Monitor Coprocessor (RW)
> */
> -#define X86_CR0_EM 0x00000004 /* Require FPU Emulation (RO)
> */
> -#define X86_CR0_TS 0x00000008 /* Task Switched (RW)
> */
> -#define X86_CR0_ET 0x00000010 /* Extension type (RO)
> */
> -#define X86_CR0_NE 0x00000020 /* Numeric Error Reporting (RW)
> */
> -#define X86_CR0_WP 0x00010000 /* Supervisor Write Protect (RW)
> */
> -#define X86_CR0_AM 0x00040000 /* Alignment Checking (RW)
> */
> -#define X86_CR0_NW 0x20000000 /* Not Write-Through (RW)
> */
> -#define X86_CR0_CD 0x40000000 /* Cache Disable (RW)
> */
> -#define X86_CR0_PG 0x80000000 /* Paging (RW)
> */
> +#define X86_CR0_PE 0x00000001U /* Enable Protected Mode
> (RW) */
> +#define X86_CR0_MP 0x00000002U /* Monitor Coprocessor
> (RW) */
> +#define X86_CR0_EM 0x00000004U /* Require FPU Emulation
> (RO) */
> +#define X86_CR0_TS 0x00000008U /* Task Switched
> (RW) */
> +#define X86_CR0_ET 0x00000010U /* Extension type
> (RO) */
> +#define X86_CR0_NE 0x00000020U /* Numeric Error Reporting
> (RW) */
> +#define X86_CR0_WP 0x00010000U /* Supervisor Write Protect
> (RW) */
> +#define X86_CR0_AM 0x00040000U /* Alignment Checking
> (RW) */
> +#define X86_CR0_NW 0x20000000U /* Not Write-Through
> (RW) */
> +#define X86_CR0_CD 0x40000000U /* Cache Disable
> (RW) */
> +#define X86_CR0_PG 0x80000000U /* Paging
> (RW) */
>
> /*
> * Intel CPU flags in CR3
> @@ -103,7 +103,7 @@
> /*
> * Debug status flags in DR6.
> */
> -#define X86_DR6_DEFAULT 0xffff0ff0 /* Default %dr6 value. */
> +#define X86_DR6_DEFAULT 0xffff0ff0U /* Default %dr6 value. */
>
> /*
> * Debug control flags in DR7.
> diff --git a/xen/arch/x86/percpu.c b/xen/arch/x86/percpu.c
> index 288050cdba..1ebeb65ad6 100644
> --- a/xen/arch/x86/percpu.c
> +++ b/xen/arch/x86/percpu.c
> @@ -12,7 +12,7 @@ unsigned long __per_cpu_offset[NR_CPUS];
> * possible #PF at (NULL + a little) which has security implications in the
> * context of PV guests.
> */
> -#define INVALID_PERCPU_AREA (0x8000000000000000L - (long)__per_cpu_start)
> +#define INVALID_PERCPU_AREA (0x8000000000000000UL - (long)__per_cpu_start)
> #define PERCPU_ORDER get_order_from_bytes(__per_cpu_data_end -
> __per_cpu_start)
Hi Jan, should this be ULL?
> void __init percpu_init_areas(void)
> diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c
> index a1e0af27c5..5581b4717a 100644
> --- a/xen/arch/x86/psr.c
> +++ b/xen/arch/x86/psr.c
> @@ -191,7 +191,7 @@ static struct feat_node *feat_l2_cat;
> static struct feat_node *feat_mba;
>
> /* Common functions */
> -#define cat_default_val(len) (0xffffffff >> (32 - (len)))
> +#define cat_default_val(len) (0xffffffffU >> (32 - (len)))
>
> /*
> * get_cdp_data - get DATA COS register value from input COS ID.
> diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c
> index 4081cef200..b030ad8a5b 100644
> --- a/xen/arch/x86/spec_ctrl.c
> +++ b/xen/arch/x86/spec_ctrl.c
> @@ -398,8 +398,8 @@ static void __init print_details(enum ind_thunk thunk)
> cpuid_count(7, 0, &max, &tmp, &tmp, &_7d0);
> if ( max >= 2 )
> cpuid_count(7, 2, &tmp, &tmp, &tmp, &_7d2);
> - if ( boot_cpu_data.extended_cpuid_level >= 0x80000008 )
> - cpuid(0x80000008, &tmp, &e8b, &tmp, &tmp);
> + if ( boot_cpu_data.extended_cpuid_level >= 0x80000008U )
> + cpuid(0x80000008U, &tmp, &e8b, &tmp, &tmp);
> if ( cpu_has_arch_caps )
> rdmsrl(MSR_ARCH_CAPABILITIES, caps);
>
> @@ -1337,8 +1337,8 @@ void __init init_speculation_mitigations(void)
> * TODO: Adjust cpu_has_svm_spec_ctrl to be usable earlier on boot.
> */
> if ( opt_msr_sc_hvm &&
> - (boot_cpu_data.extended_cpuid_level >= 0x8000000a) &&
> - (cpuid_edx(0x8000000a) & (1u << SVM_FEATURE_SPEC_CTRL)) )
> + (boot_cpu_data.extended_cpuid_level >= 0x8000000aU) &&
> + (cpuid_edx(0x8000000aU) & (1u << SVM_FEATURE_SPEC_CTRL)) )
> setup_force_cpu_cap(X86_FEATURE_SC_MSR_HVM);
> }
>
> diff --git a/xen/arch/x86/x86_64/acpi_mmcfg.c
> b/xen/arch/x86/x86_64/acpi_mmcfg.c
> index 2159c68189..cdde7e453c 100644
> --- a/xen/arch/x86/x86_64/acpi_mmcfg.c
> +++ b/xen/arch/x86/x86_64/acpi_mmcfg.c
> @@ -50,7 +50,7 @@ static int __init acpi_mcfg_check_entry(struct
> acpi_table_mcfg *mcfg,
> {
> int year;
>
> - if (cfg->address < 0xFFFFFFFF)
> + if (cfg->address < 0xFFFFFFFFU)
> return 0;
>
> if (!strncmp(mcfg->header.oem_id, "SGI", 3))
> diff --git a/xen/arch/x86/x86_64/pci.c b/xen/arch/x86/x86_64/pci.c
> index aad1c3f7cf..8d33429103 100644
> --- a/xen/arch/x86/x86_64/pci.c
> +++ b/xen/arch/x86/x86_64/pci.c
> @@ -9,7 +9,7 @@
> #include <asm/io.h>
>
> #define PCI_CONF_ADDRESS(sbdf, reg) \
> - (0x80000000 | ((sbdf).bdf << 8) | ((reg) & ~3))
> + (0x80000000U | ((sbdf).bdf << 8) | ((reg) & ~3))
>
> uint8_t pci_conf_read8(pci_sbdf_t sbdf, unsigned int reg)
> {
> diff --git a/xen/arch/x86/x86_emulate/x86_emulate.h
> b/xen/arch/x86/x86_emulate/x86_emulate.h
> index 40d5054fb7..ec6d93fb2f 100644
> --- a/xen/arch/x86/x86_emulate/x86_emulate.h
> +++ b/xen/arch/x86/x86_emulate/x86_emulate.h
> @@ -620,7 +620,7 @@ struct x86_emulate_ctxt
> * below).
> * Hence no separate #define-s get added.
> */
> -#define X86EMUL_OPC_EXT_MASK 0xffff0000
> +#define X86EMUL_OPC_EXT_MASK 0xffff0000U
> #define X86EMUL_OPC(ext, byte) ((uint8_t)(byte) | \
> MASK_INSR((ext), X86EMUL_OPC_EXT_MASK))
> /*
> diff --git a/xen/include/public/arch-x86/xen-x86_64.h
> b/xen/include/public/arch-x86/xen-x86_64.h
> index 5d9035ed22..7ea579e5fb 100644
> --- a/xen/include/public/arch-x86/xen-x86_64.h
> +++ b/xen/include/public/arch-x86/xen-x86_64.h
> @@ -53,10 +53,10 @@
> #define FLAT_USER_SS32 FLAT_RING3_SS32
> #define FLAT_USER_SS FLAT_USER_SS64
>
> -#define __HYPERVISOR_VIRT_START 0xFFFF800000000000
> -#define __HYPERVISOR_VIRT_END 0xFFFF880000000000
> -#define __MACH2PHYS_VIRT_START 0xFFFF800000000000
> -#define __MACH2PHYS_VIRT_END 0xFFFF804000000000
> +#define __HYPERVISOR_VIRT_START 0xFFFF800000000000U
> +#define __HYPERVISOR_VIRT_END 0xFFFF880000000000U
> +#define __MACH2PHYS_VIRT_START 0xFFFF800000000000U
> +#define __MACH2PHYS_VIRT_END 0xFFFF804000000000U
Also here ULL?
> #ifndef HYPERVISOR_VIRT_START
> #define HYPERVISOR_VIRT_START xen_mk_ulong(__HYPERVISOR_VIRT_START)
> diff --git a/xen/lib/x86/cpuid.c b/xen/lib/x86/cpuid.c
> index 07e5501914..a4ea579ebe 100644
> --- a/xen/lib/x86/cpuid.c
> +++ b/xen/lib/x86/cpuid.c
> @@ -217,10 +217,10 @@ void x86_cpu_policy_fill_native(struct cpu_policy *p)
> }
>
> /* Extended leaves. */
> - cpuid_leaf(0x80000000, &p->extd.raw[0]);
> + cpuid_leaf(0x80000000U, &p->extd.raw[0]);
> for ( i = 1; i <= MIN(p->extd.max_leaf & 0xffffU,
> ARRAY_SIZE(p->extd.raw) - 1); ++i )
> - cpuid_leaf(0x80000000 + i, &p->extd.raw[i]);
> + cpuid_leaf(0x80000000U + i, &p->extd.raw[i]);
>
> /* Don't report leaves from possible lower level hypervisor, for now. */
> p->hv_limit = 0;
> @@ -421,7 +421,7 @@ int x86_cpuid_copy_to_buffer(const struct cpu_policy *p,
> /* Extended leaves. */
> for ( leaf = 0; leaf <= MIN(p->extd.max_leaf & 0xfffful,
> ARRAY_SIZE(p->extd.raw) - 1); ++leaf )
> - COPY_LEAF(0x80000000 | leaf, XEN_CPUID_NO_SUBLEAF,
> &p->extd.raw[leaf]);
> + COPY_LEAF(0x80000000U | leaf, XEN_CPUID_NO_SUBLEAF,
> &p->extd.raw[leaf]);
>
> #undef COPY_LEAF
>
> @@ -521,7 +521,7 @@ int x86_cpuid_copy_from_buffer(struct cpu_policy *p,
> p->hv2_limit = l.a;
> break;
>
> - case 0x80000000 ... 0x80000000 + ARRAY_SIZE(p->extd.raw) - 1:
> + case 0x80000000U ... 0x80000000U + ARRAY_SIZE(p->extd.raw) - 1:
> if ( data.subleaf != XEN_CPUID_NO_SUBLEAF )
> goto out_of_range;
>
> diff --git a/xen/lib/x86/policy.c b/xen/lib/x86/policy.c
> index a9c60000af..f033d22785 100644
> --- a/xen/lib/x86/policy.c
> +++ b/xen/lib/x86/policy.c
> @@ -22,7 +22,7 @@ int x86_cpu_policies_are_compatible(const struct cpu_policy
> *host,
> FAIL_CPUID(7, 0);
>
> if ( guest->extd.max_leaf > host->extd.max_leaf )
> - FAIL_CPUID(0x80000000, NA);
> + FAIL_CPUID(0x80000000U, NA);
>
> /* TODO: Audit more CPUID data. */
>
> --
> 2.41.0
>
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |