diff --git a/hypervisor/arch/x86/ept.c b/hypervisor/arch/x86/ept.c
index 403e0f67b..1dfc4cfda 100644
--- a/hypervisor/arch/x86/ept.c
+++ b/hypervisor/arch/x86/ept.c
@@ -9,14 +9,14 @@
 #include "guest/instr_emul_wrapper.h"
 #include "guest/instr_emul.h"
 
-#define ACRN_DBG_EPT	6
+#define ACRN_DBG_EPT	6U
 
 
 static uint64_t find_next_table(uint32_t table_offset, void *table_base)
 {
 	uint64_t table_entry;
 	uint64_t table_present;
-	uint64_t sub_table_addr = 0;
+	uint64_t sub_table_addr = 0UL;
 
 	/* Read the table entry */
 	table_entry = mem_read64(table_base
@@ -31,7 +31,7 @@ static uint64_t find_next_table(uint32_t table_offset, void *table_base)
 	table_present = (IA32E_EPT_R_BIT | IA32E_EPT_W_BIT | IA32E_EPT_X_BIT);
 
 	/* Determine if a valid entry exists */
-	if ((table_entry & table_present) == 0) {
+	if ((table_entry & table_present) == 0UL) {
 		/* No entry present */
 		return sub_table_addr;
 	}
@@ -111,8 +111,8 @@ void destroy_ept(struct vm *vm)
 
 uint64_t _gpa2hpa(struct vm *vm, uint64_t gpa, uint32_t *size)
 {
-	uint64_t hpa = 0;
-	uint32_t pg_size = 0;
+	uint64_t hpa = 0UL;
+	uint32_t pg_size = 0U;
 	struct entry_params entry;
 	struct map_params map_params;
 
@@ -221,7 +221,7 @@ int register_mmio_emulation_handler(struct vm *vm,
 	if ((read_write != NULL) && (end > start)) {
 		/* Allocate memory for node */
 		mmio_node =
-		(struct mem_io_node *)calloc(1, sizeof(struct mem_io_node));
+		(struct mem_io_node *)calloc(1U, sizeof(struct mem_io_node));
 
 		/* Ensure memory successfully allocated */
 		if (mmio_node != NULL) {
@@ -460,7 +460,7 @@ int ept_misconfig_vmexit_handler(__unused struct vcpu *vcpu)
 
 	ASSERT(status == 0, "EPT Misconfiguration is not handled.\n");
 
-	TRACE_2L(TRACE_VMEXIT_EPT_MISCONFIGURATION, 0, 0);
+	TRACE_2L(TRACE_VMEXIT_EPT_MISCONFIGURATION, 0UL, 0UL);
 
 	return status;
 }
diff --git a/hypervisor/arch/x86/mmu.c b/hypervisor/arch/x86/mmu.c
index 57a227e5b..a52d8a436 100644
--- a/hypervisor/arch/x86/mmu.c
+++ b/hypervisor/arch/x86/mmu.c
@@ -165,12 +165,12 @@ void flush_vpid_single(int vpid)
 	if (vpid == 0)
 		return;
 
-	_invvpid(VMX_VPID_TYPE_SINGLE_CONTEXT, vpid, 0);
+	_invvpid(VMX_VPID_TYPE_SINGLE_CONTEXT, vpid, 0UL);
 }
 
 void flush_vpid_global(void)
 {
-	_invvpid(VMX_VPID_TYPE_ALL_CONTEXT, 0, 0);
+	_invvpid(VMX_VPID_TYPE_ALL_CONTEXT, 0, 0UL);
 }
 
 void invept(struct vcpu *vcpu)
@@ -530,7 +530,7 @@ static void *walk_paging_struct(void *addr, void *table_base,
 		}
 
 		/* Determine if a valid entry exists */
-		if ((table_entry & entry_present) == 0) {
+		if ((table_entry & entry_present) == 0UL) {
 			/* No entry present - need to allocate a new table */
 			sub_table_addr = alloc_paging_struct();
 			/* Check to ensure memory available for this structure*/
@@ -570,7 +570,7 @@ uint64_t get_paging_pml4(void)
 
 void enable_paging(uint64_t pml4_base_addr)
 {
-	uint64_t tmp64 = 0;
+	uint64_t tmp64 = 0UL;
 
 	/* Enable Write Protect, inhibiting writing to read-only pages */
 	CPU_CR_READ(cr0, &tmp64);
@@ -581,7 +581,7 @@ void enable_paging(uint64_t pml4_base_addr)
 
 void enable_smep(void)
 {
-	uint64_t val64 = 0;
+	uint64_t val64 = 0UL;
 
 	/* Enable CR4.SMEP*/
 	CPU_CR_READ(cr4, &val64);
@@ -665,8 +665,8 @@ void free_paging_struct(void *ptr)
 
 bool check_continuous_hpa(struct vm *vm, uint64_t gpa, uint64_t size)
 {
-	uint64_t curr_hpa = 0;
-	uint64_t next_hpa = 0;
+	uint64_t curr_hpa = 0UL;
+	uint64_t next_hpa = 0UL;
 
 	/* if size <= PAGE_SIZE_4K, it is continuous,no need check
 	 * if size > PAGE_SIZE_4K, need to fetch next page
@@ -687,7 +687,7 @@ int obtain_last_page_table_entry(struct map_params *map_params,
 		struct entry_params *entry, void *addr, bool direct)
 {
 	uint64_t table_entry;
-	uint32_t entry_present = 0;
+	uint32_t entry_present = 0U;
 	int ret = 0;
 	/* Obtain the PML4 address */
 	void *table_addr = direct ? (map_params->pml4_base)
diff --git a/hypervisor/arch/x86/trusty.c b/hypervisor/arch/x86/trusty.c
index 13233d76e..d9c34cf32 100644
--- a/hypervisor/arch/x86/trusty.c
+++ b/hypervisor/arch/x86/trusty.c
@@ -74,10 +74,10 @@ static struct key_info g_key_info = {
 static void create_secure_world_ept(struct vm *vm, uint64_t gpa_orig,
 		uint64_t size, uint64_t gpa_rebased)
 {
-	uint64_t nworld_pml4e = 0;
-	uint64_t sworld_pml4e = 0;
+	uint64_t nworld_pml4e = 0UL;
+	uint64_t sworld_pml4e = 0UL;
 	struct map_params map_params;
-	uint64_t gpa = 0;
+	uint64_t gpa = 0UL;
 	uint64_t hpa = gpa2hpa(vm, gpa_orig);
 	uint64_t table_present = (IA32E_EPT_R_BIT |
 				IA32E_EPT_W_BIT |
@@ -109,7 +109,7 @@ static void create_secure_world_ept(struct vm *vm, uint64_t gpa_orig,
 
 	/* Unmap gpa_orig~gpa_orig+size from guest normal world ept mapping */
 	map_params.pml4_base = HPA2HVA(vm->arch_vm.nworld_eptp);
-	unmap_mem(&map_params, (void *)hpa, (void *)gpa_orig, size, 0);
+	unmap_mem(&map_params, (void *)hpa, (void *)gpa_orig, size, 0U);
 
 	/* Copy PDPT entries from Normal world to Secure world
 	 * Secure world can access Normal World's memory,
@@ -350,7 +350,7 @@ static bool setup_trusty_info(struct vcpu *vcpu,
 				BUP_MKHI_BOOTLOADER_SEED_LEN,
 				g_key_info.dseed_list[i].seed,
 				BUP_MKHI_BOOTLOADER_SEED_LEN,
-				NULL, 0,
+				NULL, 0U,
 				vcpu->vm->GUID, sizeof(vcpu->vm->GUID)) == 0) {
 			(void)memset(key_info, 0, sizeof(struct key_info));
 			pr_err("%s: derive dvseed failed!", __func__);
@@ -495,7 +495,7 @@ void trusty_set_dseed(void *dseed, uint8_t dseed_num)
 	if ((dseed == NULL) || (dseed_num == 0U) ||
 		(dseed_num > BOOTLOADER_SEED_MAX_ENTRIES)) {
 
-		g_key_info.num_seeds = 1;
+		g_key_info.num_seeds = 1U;
 		(void)memset(g_key_info.dseed_list[0].seed, 0xA5,
 			sizeof(g_key_info.dseed_list[0].seed));
 		return;
diff --git a/hypervisor/include/arch/x86/cpu.h b/hypervisor/include/arch/x86/cpu.h
index f2a35d0f5..fe3917e90 100644
--- a/hypervisor/include/arch/x86/cpu.h
+++ b/hypervisor/include/arch/x86/cpu.h
@@ -40,7 +40,7 @@
 
 /* Define page size */
 #define CPU_PAGE_SHIFT          12
-#define CPU_PAGE_SIZE           0x1000
+#define CPU_PAGE_SIZE           0x1000U
 #define CPU_PAGE_MASK           0xFFFFFFFFFFFFF000UL
 
 #define MMU_PTE_PAGE_SHIFT	CPU_PAGE_SHIFT
diff --git a/hypervisor/include/arch/x86/io.h b/hypervisor/include/arch/x86/io.h
index 8e716e0f5..0dcadd3d2 100644
--- a/hypervisor/include/arch/x86/io.h
+++ b/hypervisor/include/arch/x86/io.h
@@ -331,8 +331,8 @@ enum mem_io_type {
 };
 
 /* MMIO emulation related structures */
-#define MMIO_TRANS_VALID        1
-#define MMIO_TRANS_INVALID      0
+#define MMIO_TRANS_VALID        1U
+#define MMIO_TRANS_INVALID      0U
 struct mem_io {
 	uint64_t paddr;      /* Physical address being accessed */
 	enum mem_io_type read_write;   /* 0 = read / 1 = write operation */
diff --git a/hypervisor/include/arch/x86/mmu.h b/hypervisor/include/arch/x86/mmu.h
index 0ac3092b4..75599b92b 100644
--- a/hypervisor/include/arch/x86/mmu.h
+++ b/hypervisor/include/arch/x86/mmu.h
@@ -8,7 +8,7 @@
 #define MMU_H
 
 /* Size of all page-table entries (in bytes) */
-#define     IA32E_COMM_ENTRY_SIZE           8
+#define     IA32E_COMM_ENTRY_SIZE           8U
 
 /* Definitions common for all IA-32e related paging entries */
 #define     IA32E_COMM_P_BIT                0x0000000000000001UL
@@ -144,8 +144,8 @@
 
 /* IA32E Paging constants */
 #define     IA32E_INDEX_MASK_BITS           9
-#define     IA32E_NUM_ENTRIES               512
-#define     IA32E_INDEX_MASK                (uint64_t)(IA32E_NUM_ENTRIES - 1)
+#define     IA32E_NUM_ENTRIES               512U
+#define     IA32E_INDEX_MASK                (uint64_t)(IA32E_NUM_ENTRIES - 1U)
 #define     IA32E_REF_MASK			\
 		(boot_cpu_data.physical_address_mask)
 #define     IA32E_FIRST_BLOCK_INDEX         1
@@ -210,7 +210,7 @@
 #define     MMU_MEM_ATTR_TYPE_MASK \
 		(IA32E_PDPTE_PAT_BIT | IA32E_COMM_PCD_BIT | IA32E_COMM_PWT_BIT)
 
-#define ROUND_PAGE_UP(addr)  (((addr) + CPU_PAGE_SIZE - 1U) & CPU_PAGE_MASK)
+#define ROUND_PAGE_UP(addr)  (((addr) + (uint64_t)CPU_PAGE_SIZE - 1UL) & CPU_PAGE_MASK)
 #define ROUND_PAGE_DOWN(addr) ((addr) & CPU_PAGE_MASK)
 
 enum _page_table_type {
diff --git a/hypervisor/include/arch/x86/trusty.h b/hypervisor/include/arch/x86/trusty.h
index 59b82482b..cbbc2e743 100644
--- a/hypervisor/include/arch/x86/trusty.h
+++ b/hypervisor/include/arch/x86/trusty.h
@@ -7,7 +7,7 @@
 #ifndef TRUSTY_H_
 #define TRUSTY_H_
 
-#define BOOTLOADER_SEED_MAX_ENTRIES    10
+#define BOOTLOADER_SEED_MAX_ENTRIES    10U
 #define RPMB_MAX_PARTITION_NUMBER       6
 #define MMC_PROD_NAME_WITH_PSN_LEN      15
 #define BUP_MKHI_BOOTLOADER_SEED_LEN    64
diff --git a/hypervisor/include/arch/x86/vmx.h b/hypervisor/include/arch/x86/vmx.h
index d6cdebe9f..93ef4d2e7 100644
--- a/hypervisor/include/arch/x86/vmx.h
+++ b/hypervisor/include/arch/x86/vmx.h
@@ -317,10 +317,10 @@
 #define VMX_MIN_NR_VPID			1
 #define VMX_MAX_NR_VPID			(1 << 5)
 
-#define VMX_VPID_TYPE_INDIVIDUAL_ADDR	0
-#define VMX_VPID_TYPE_SINGLE_CONTEXT	1
-#define VMX_VPID_TYPE_ALL_CONTEXT	2
-#define VMX_VPID_TYPE_SINGLE_NON_GLOBAL	3
+#define VMX_VPID_TYPE_INDIVIDUAL_ADDR	0UL
+#define VMX_VPID_TYPE_SINGLE_CONTEXT	1UL
+#define VMX_VPID_TYPE_ALL_CONTEXT	2UL
+#define VMX_VPID_TYPE_SINGLE_NON_GLOBAL	3UL
 
 #define VMX_VPID_INVVPID			(1U << 0) /* (32 - 32) */
 #define VMX_VPID_INVVPID_INDIVIDUAL_ADDR	(1U << 8) /* (40 - 32) */
diff --git a/hypervisor/include/lib/macros.h b/hypervisor/include/lib/macros.h
index 5f468a69c..b3db9f8c1 100644
--- a/hypervisor/include/lib/macros.h
+++ b/hypervisor/include/lib/macros.h
@@ -38,7 +38,7 @@
  * NOTE:  The required alignment must be a power of 2 (2, 4, 8, 16, 32, etc)
  */
 #define MEM_ALIGNED_CHECK(value, req_align)                             \
-	(((uint64_t)(value) & ((uint64_t)(req_align) - (uint64_t)1)) == 0)
+	(((uint64_t)(value) & ((uint64_t)(req_align) - 1UL)) == 0UL)
 
 #if !defined(ASSEMBLER) && !defined(LINKER_SCRIPT)
 
diff --git a/hypervisor/include/public/acrn_common.h b/hypervisor/include/public/acrn_common.h
index 68abf745b..97ba79013 100644
--- a/hypervisor/include/public/acrn_common.h
+++ b/hypervisor/include/public/acrn_common.h
@@ -31,10 +31,10 @@
 #define REQ_STATE_PROCESSING	2
 #define REQ_STATE_FAILED	-1
 
-#define REQ_PORTIO	0
-#define REQ_MMIO	1
-#define REQ_PCICFG	2
-#define REQ_WP		3
+#define REQ_PORTIO	0U
+#define REQ_MMIO	1U
+#define REQ_PCICFG	2U
+#define REQ_WP		3U
 
 #define REQUEST_READ	0
 #define REQUEST_WRITE	1
diff --git a/hypervisor/include/public/acrn_hv_defs.h b/hypervisor/include/public/acrn_hv_defs.h
index aa7ee68f1..f959772aa 100644
--- a/hypervisor/include/public/acrn_hv_defs.h
+++ b/hypervisor/include/public/acrn_hv_defs.h
@@ -106,9 +106,9 @@
  * the parameter for HC_VM_SET_MEMMAP hypercall
  */
 struct vm_set_memmap {
-#define MAP_MEM		0
-#define MAP_MMIO	1
-#define MAP_UNMAP	2
+#define MAP_MEM		0U
+#define MAP_MMIO	1U
+#define MAP_UNMAP	2U
 	/** map type: MAP_MEM, MAP_MMIO or MAP_UNMAP */
 	uint32_t type;