HV:treewide:rename vm data structure

For data structure types "struct vm", its name is identical with variable name in the same scope. This is a MISRA C violation. Naming convention rule:If the data structure type is used by multi modules, its corresponding logic resource is exposed to external components (such as SOS, UOS), and its name meaning is simplistic (such as vcpu, vm), its name needs prefix "acrn_". The following udpates are made: struct vm *vm-->struct acrn_vm *vm Tracked-On: #861 Signed-off-by: Xiangyang Wu <xiangyang.wu@linux.intel.com>
2025-09-04 18:30:18 +00:00 · 2018-11-05 13:28:23 +08:00
parent ace4f48c9a
commit 99586e32cc
66 changed files with 349 additions and 349 deletions
--- a/hypervisor/include/arch/x86/abl_seed_parse.h
+++ b/hypervisor/include/arch/x86/abl_seed_parse.h
@@ -7,6 +7,6 @@
 #ifndef ABL_SEED_PARSE_H_
 #define ABL_SEED_PARSE_H_

-bool abl_seed_parse(struct vm *vm, char *cmdline, char *out_arg, uint32_t out_len);
+bool abl_seed_parse(struct acrn_vm *vm, char *cmdline, char *out_arg, uint32_t out_len);

 #endif /* ABL_SEED_PARSE_H_ */
--- a/hypervisor/include/arch/x86/assign.h
+++ b/hypervisor/include/arch/x86/assign.h
@@ -9,18 +9,18 @@

 #include <ptdev.h>

-void ptdev_intx_ack(struct vm *vm, uint8_t virt_pin,
+void ptdev_intx_ack(struct acrn_vm *vm, uint8_t virt_pin,
 		enum ptdev_vpin_source vpin_src);
-int ptdev_msix_remap(struct vm *vm, uint16_t virt_bdf,
+int ptdev_msix_remap(struct acrn_vm *vm, uint16_t virt_bdf,
 		uint16_t entry_nr, struct ptdev_msi_info *info);
-int ptdev_intx_pin_remap(struct vm *vm, uint8_t virt_pin,
+int ptdev_intx_pin_remap(struct acrn_vm *vm, uint8_t virt_pin,
 		enum ptdev_vpin_source vpin_src);
-int ptdev_add_intx_remapping(struct vm *vm, uint8_t virt_pin, uint8_t phys_pin,
+int ptdev_add_intx_remapping(struct acrn_vm *vm, uint8_t virt_pin, uint8_t phys_pin,
 		bool pic_pin);
-void ptdev_remove_intx_remapping(const struct vm *vm, uint8_t virt_pin, bool pic_pin);
-int ptdev_add_msix_remapping(struct vm *vm, uint16_t virt_bdf,
+void ptdev_remove_intx_remapping(const struct acrn_vm *vm, uint8_t virt_pin, bool pic_pin);
+int ptdev_add_msix_remapping(struct acrn_vm *vm, uint16_t virt_bdf,
 	uint16_t phys_bdf, uint32_t vector_count);
-void ptdev_remove_msix_remapping(const struct vm *vm, uint16_t virt_bdf,
+void ptdev_remove_msix_remapping(const struct acrn_vm *vm, uint16_t virt_bdf,
 		uint32_t vector_count);

 #endif /* ASSIGN_H */
--- a/hypervisor/include/arch/x86/cpuid.h
+++ b/hypervisor/include/arch/x86/cpuid.h
@@ -131,7 +131,7 @@ static inline void cpuid_subleaf(uint32_t leaf, uint32_t subleaf,
 	asm_cpuid(eax, ebx, ecx, edx);
 }

-int set_vcpuid_entries(struct vm *vm);
+int set_vcpuid_entries(struct acrn_vm *vm);
 void guest_cpuid(struct acrn_vcpu *vcpu,
 			uint32_t *eax, uint32_t *ebx,
 			uint32_t *ecx, uint32_t *edx);
--- a/hypervisor/include/arch/x86/guest/guest.h
+++ b/hypervisor/include/arch/x86/guest/guest.h
@@ -87,7 +87,7 @@ struct e820_mem_params {
 	uint64_t max_ram_blk_size;
 };

-int prepare_vm0_memmap_and_e820(struct vm *vm);
+int prepare_vm0_memmap_and_e820(struct acrn_vm *vm);
 uint64_t e820_alloc_low_memory(uint32_t size_arg);

 /* Definition for a mem map lookup */
@@ -110,7 +110,7 @@ enum vm_paging_mode {
 /*
 * VM related APIs
 */
-uint64_t vcpumask2pcpumask(struct vm *vm, uint64_t vdmask);
+uint64_t vcpumask2pcpumask(struct acrn_vm *vm, uint64_t vdmask);

 int gva2gpa(struct acrn_vcpu *vcpu, uint64_t gva, uint64_t *gpa, uint32_t *err_code);

@@ -142,9 +142,9 @@ void init_msr_emulation(struct acrn_vcpu *vcpu);
 struct run_context;
 int vmx_vmrun(struct run_context *context, int ops, int ibrs);

-int general_sw_loader(struct vm *vm);
+int general_sw_loader(struct acrn_vm *vm);

-typedef int (*vm_sw_loader_t)(struct vm *vm);
+typedef int (*vm_sw_loader_t)(struct acrn_vm *vm);
 extern vm_sw_loader_t vm_sw_loader;
 /**
 * @brief Data transfering between hypervisor and VM
@@ -170,7 +170,7 @@ extern vm_sw_loader_t vm_sw_loader;
 *   continuous
 * @pre Pointer vm is non-NULL
 */
-int copy_from_gpa(struct vm *vm, void *h_ptr, uint64_t gpa, uint32_t size);
+int copy_from_gpa(struct acrn_vm *vm, void *h_ptr, uint64_t gpa, uint32_t size);
 /**
 * @brief Copy data from HV address space to VM GPA space
 *
@@ -189,7 +189,7 @@ int copy_from_gpa(struct vm *vm, void *h_ptr, uint64_t gpa, uint32_t size);
 *   continuous
 * @pre Pointer vm is non-NULL
 */
-int copy_to_gpa(struct vm *vm, void *h_ptr, uint64_t gpa, uint32_t size);
+int copy_to_gpa(struct acrn_vm *vm, void *h_ptr, uint64_t gpa, uint32_t size);
 /**
 * @brief Copy data from VM GVA space to HV address space
 *
--- a/hypervisor/include/arch/x86/guest/guest_pm.h
+++ b/hypervisor/include/arch/x86/guest/guest_pm.h
@@ -7,9 +7,9 @@
 #ifndef GUEST_PM_H
 #define GUEST_PM_H

-void vm_setup_cpu_state(struct vm *vm);
-int vm_load_pm_s_state(struct vm *vm);
-int validate_pstate(const struct vm *vm, uint64_t perf_ctl);
-void register_pm1ab_handler(struct vm *vm);
+void vm_setup_cpu_state(struct acrn_vm *vm);
+int vm_load_pm_s_state(struct acrn_vm *vm);
+int validate_pstate(const struct acrn_vm *vm, uint64_t perf_ctl);
+void register_pm1ab_handler(struct acrn_vm *vm);

 #endif /* PM_H */
--- a/hypervisor/include/arch/x86/guest/mptable.h
+++ b/hypervisor/include/arch/x86/guest/mptable.h
@@ -26,6 +26,6 @@ struct mptable_info;
 extern struct mptable_info mptable_vm1;
 extern struct mptable_info mptable_vm2;

-int mptable_build(struct vm *vm);
+int mptable_build(struct acrn_vm *vm);

 #endif /* MPTABLE_H */
--- a/hypervisor/include/arch/x86/guest/vcpu.h
+++ b/hypervisor/include/arch/x86/guest/vcpu.h
@@ -219,13 +219,13 @@ struct acrn_vcpu_arch {

 } __aligned(CPU_PAGE_SIZE);

-struct vm;
+struct acrn_vm;
 struct acrn_vcpu {
 	/* Architecture specific definitions for this VCPU */
 	struct acrn_vcpu_arch arch;
 	uint16_t pcpu_id;	/* Physical CPU ID of this VCPU */
 	uint16_t vcpu_id;	/* virtual identifier for VCPU */
-	struct vm *vm;		/* Reference to the VM this VCPU belongs to */
+	struct acrn_vm *vm;		/* Reference to the VM this VCPU belongs to */

 	/* State of this VCPU before suspend */
 	volatile enum vcpu_state prev_state;
@@ -514,7 +514,7 @@ struct acrn_vcpu* get_ever_run_vcpu(uint16_t pcpu_id);
 *
 * @return 0: vcpu created successfully, other values failed.
 */
-int create_vcpu(uint16_t pcpu_id, struct vm *vm, struct acrn_vcpu **rtn_vcpu_handle);
+int create_vcpu(uint16_t pcpu_id, struct acrn_vm *vm, struct acrn_vcpu **rtn_vcpu_handle);

 /**
 * @brief run into non-root mode based on vcpu setting
@@ -586,7 +586,7 @@ void schedule_vcpu(struct acrn_vcpu *vcpu);
 * @param[inout] vm pointer to vm data structure
 * @param[in] pcpu_id which the vcpu will be mapped 
 */
-int prepare_vcpu(struct vm *vm, uint16_t pcpu_id);
+int prepare_vcpu(struct acrn_vm *vm, uint16_t pcpu_id);

 void request_vcpu_pre_work(struct acrn_vcpu *vcpu, uint16_t pre_work_id);

--- a/hypervisor/include/arch/x86/guest/vioapic.h
+++ b/hypervisor/include/arch/x86/guest/vioapic.h
@@ -46,7 +46,7 @@
 #define STATE_BITMAP_SIZE	INT_DIV_ROUNDUP(REDIR_ENTRIES_HW, 64U)

 struct acrn_vioapic {
-	struct vm	*vm;
+	struct acrn_vm	*vm;
 	spinlock_t	mtx;
 	uint32_t	id;
 	uint32_t	ioregsel;
@@ -55,7 +55,7 @@ struct acrn_vioapic {
 	uint64_t pin_state[STATE_BITMAP_SIZE];
 };

-void    vioapic_init(struct vm *vm);
+void    vioapic_init(struct acrn_vm *vm);
 void	vioapic_cleanup(const struct acrn_vioapic *vioapic);
 void	vioapic_reset(struct acrn_vioapic *vioapic);

@@ -79,7 +79,7 @@ void	vioapic_reset(struct acrn_vioapic *vioapic);
 *
 * @return void
 */
-void	vioapic_set_irq(struct vm *vm, uint32_t irq, uint32_t operation);
+void	vioapic_set_irq(struct acrn_vm *vm, uint32_t irq, uint32_t operation);

 /**
 * @brief Set vIOAPIC IRQ line status.
@@ -95,12 +95,12 @@ void	vioapic_set_irq(struct vm *vm, uint32_t irq, uint32_t operation);
 * @pre irq < vioapic_pincount(vm)
 * @return void
 */
-void	vioapic_set_irq_nolock(struct vm *vm, uint32_t irq, uint32_t operation);
+void	vioapic_set_irq_nolock(struct acrn_vm *vm, uint32_t irq, uint32_t operation);
 void	vioapic_update_tmr(struct acrn_vcpu *vcpu);

-uint32_t	vioapic_pincount(const struct vm *vm);
-void	vioapic_process_eoi(struct vm *vm, uint32_t vector);
-void	vioapic_get_rte(struct vm *vm, uint32_t pin, union ioapic_rte *rte);
+uint32_t	vioapic_pincount(const struct acrn_vm *vm);
+void	vioapic_process_eoi(struct acrn_vm *vm, uint32_t vector);
+void	vioapic_get_rte(struct acrn_vm *vm, uint32_t pin, union ioapic_rte *rte);
 int		vioapic_mmio_access_handler(struct io_request *io_req, void *handler_private_data);

 #ifdef HV_DEBUG
--- a/hypervisor/include/arch/x86/guest/vlapic.h
+++ b/hypervisor/include/arch/x86/guest/vlapic.h
@@ -69,7 +69,7 @@ struct acrn_vlapic {
 	struct lapic_regs	apic_page;
 	struct vlapic_pir_desc	pir_desc;

-	struct vm		*vm;
+	struct acrn_vm		*vm;
 	struct acrn_vcpu		*vcpu;

 	uint32_t		esr_pending;
@@ -233,7 +233,7 @@ vlapic_intr_edge(struct acrn_vcpu *vcpu, uint32_t vector)
 *
 * @pre vm != NULL
 */
-int vlapic_set_local_intr(struct vm *vm, uint16_t vcpu_id_arg, uint32_t vector);
+int vlapic_set_local_intr(struct acrn_vm *vm, uint16_t vcpu_id_arg, uint32_t vector);

 /**
 * @brief Inject MSI to target VM.
@@ -247,9 +247,9 @@ int vlapic_set_local_intr(struct vm *vm, uint16_t vcpu_id_arg, uint32_t vector);
 *
 * @pre vm != NULL
 */
-int vlapic_intr_msi(struct vm *vm, uint64_t addr, uint64_t msg);
+int vlapic_intr_msi(struct acrn_vm *vm, uint64_t addr, uint64_t msg);

-void vlapic_deliver_intr(struct vm *vm, bool level, uint32_t dest,
+void vlapic_deliver_intr(struct acrn_vm *vm, bool level, uint32_t dest,
 		bool phys, uint32_t delmode, uint32_t vec, bool rh);

 /* Reset the trigger-mode bits for all vectors to be edge-triggered */
@@ -281,7 +281,7 @@ int apic_access_vmexit_handler(struct acrn_vcpu *vcpu);
 int apic_write_vmexit_handler(struct acrn_vcpu *vcpu);
 int veoi_vmexit_handler(struct acrn_vcpu *vcpu);
 int tpr_below_threshold_vmexit_handler(__unused struct acrn_vcpu *vcpu);
-void calcvdest(struct vm *vm, uint64_t *dmask, uint32_t dest, bool phys);
+void calcvdest(struct acrn_vm *vm, uint64_t *dmask, uint32_t dest, bool phys);

 /**
 * @}
--- a/hypervisor/include/arch/x86/guest/vm.h
+++ b/hypervisor/include/arch/x86/guest/vm.h
@@ -130,7 +130,7 @@ struct vcpuid_entry {
 	uint32_t padding;
 };

-struct vm {
+struct acrn_vm {
 	struct vm_arch arch_vm; /* Reference to this VM's arch information */
 	struct vm_hw_info hw;	/* Reference to this VM's HW information */
 	struct vm_sw_info sw;	/* Reference to SW associated with this VM */
@@ -197,7 +197,7 @@ struct vm_description {
 #endif
 };

-static inline bool is_vm0(const struct vm *vm)
+static inline bool is_vm0(const struct acrn_vm *vm)
 {
 	return (vm->vm_id) == 0U;
 }
@@ -205,7 +205,7 @@ static inline bool is_vm0(const struct vm *vm)
 /*
 * @pre vcpu_id < CONFIG_MAX_VCPUS_PER_VM
 */
-static inline struct acrn_vcpu *vcpu_from_vid(struct vm *vm, uint16_t vcpu_id)
+static inline struct acrn_vcpu *vcpu_from_vid(struct acrn_vm *vm, uint16_t vcpu_id)
 {
 	uint16_t i;
 	struct acrn_vcpu *vcpu;
@@ -218,7 +218,7 @@ static inline struct acrn_vcpu *vcpu_from_vid(struct vm *vm, uint16_t vcpu_id)
 	return vcpu;
 }

-static inline struct acrn_vcpu *vcpu_from_pid(struct vm *vm, uint16_t pcpu_id)
+static inline struct acrn_vcpu *vcpu_from_pid(struct acrn_vm *vm, uint16_t pcpu_id)
 {
 	uint16_t i;
 	struct acrn_vcpu *vcpu;
@@ -232,7 +232,7 @@ static inline struct acrn_vcpu *vcpu_from_pid(struct vm *vm, uint16_t pcpu_id)
 	return NULL;
 }

-static inline struct acrn_vcpu *get_primary_vcpu(struct vm *vm)
+static inline struct acrn_vcpu *get_primary_vcpu(struct acrn_vm *vm)
 {
 	uint16_t i;
 	struct acrn_vcpu *vcpu;
@@ -247,37 +247,37 @@ static inline struct acrn_vcpu *get_primary_vcpu(struct vm *vm)
 }

 static inline struct acrn_vuart*
-vm_vuart(struct vm *vm)
+vm_vuart(struct acrn_vm *vm)
 {
 	return &(vm->vuart);
 }

 static inline struct acrn_vpic *
-vm_pic(struct vm *vm)
+vm_pic(struct acrn_vm *vm)
 {
 	return (struct acrn_vpic *)&(vm->arch_vm.vpic);
 }

 static inline struct acrn_vioapic *
-vm_ioapic(struct vm *vm)
+vm_ioapic(struct acrn_vm *vm)
 {
 	return (struct acrn_vioapic *)&(vm->arch_vm.vioapic);
 }

-int shutdown_vm(struct vm *vm);
-void pause_vm(struct vm *vm);
-void resume_vm(struct vm *vm);
-void resume_vm_from_s3(struct vm *vm, uint32_t wakeup_vec);
-int start_vm(struct vm *vm);
-int reset_vm(struct vm *vm);
-int create_vm(struct vm_description *vm_desc, struct vm **rtn_vm);
+int shutdown_vm(struct acrn_vm *vm);
+void pause_vm(struct acrn_vm *vm);
+void resume_vm(struct acrn_vm *vm);
+void resume_vm_from_s3(struct acrn_vm *vm, uint32_t wakeup_vec);
+int start_vm(struct acrn_vm *vm);
+int reset_vm(struct acrn_vm *vm);
+int create_vm(struct vm_description *vm_desc, struct acrn_vm **rtn_vm);
 int prepare_vm(uint16_t pcpu_id);

 #ifdef CONFIG_PARTITION_MODE
 const struct vm_description_array *get_vm_desc_base(void);
 #endif

-struct vm *get_vm_from_vmid(uint16_t vm_id);
+struct acrn_vm *get_vm_from_vmid(uint16_t vm_id);

 #ifdef CONFIG_PARTITION_MODE
 struct vm_description_array {
@@ -291,6 +291,6 @@ struct pcpu_vm_desc_mapping {
 };
 extern const struct pcpu_vm_desc_mapping pcpu_vm_desc_map[];

-void vrtc_init(struct vm *vm);
+void vrtc_init(struct acrn_vm *vm);
 #endif
 #endif /* VM_H_ */
--- a/hypervisor/include/arch/x86/guest/vpic.h
+++ b/hypervisor/include/arch/x86/guest/vpic.h
@@ -121,12 +121,12 @@ struct i8259_reg_state {
 };

 struct acrn_vpic {
-	struct vm		*vm;
+	struct acrn_vm		*vm;
 	spinlock_t	lock;
 	struct i8259_reg_state	i8259[2];
 };

-void vpic_init(struct vm *vm);
+void vpic_init(struct acrn_vm *vm);

 /**
 * @brief virtual PIC
@@ -145,7 +145,7 @@ void vpic_init(struct vm *vm);
 *
 * @return void
 */
-void vpic_set_irq(struct vm *vm, uint32_t irq, uint32_t operation);
+void vpic_set_irq(struct acrn_vm *vm, uint32_t irq, uint32_t operation);

 /**
 * @brief Get pending virtual interrupts for vPIC.
@@ -156,7 +156,7 @@ void vpic_set_irq(struct vm *vm, uint32_t irq, uint32_t operation);
 *
 * @return void.
 */
-void vpic_pending_intr(struct vm *vm, uint32_t *vecptr);
+void vpic_pending_intr(struct acrn_vm *vm, uint32_t *vecptr);

 /**
 * @brief Accept virtual interrupt for vPIC.
@@ -168,8 +168,8 @@ void vpic_pending_intr(struct vm *vm, uint32_t *vecptr);
 *
 * @pre vm != NULL
 */
-void vpic_intr_accepted(struct vm *vm, uint32_t vector);
-void vpic_get_irq_trigger(struct vm *vm, uint32_t irq,
+void vpic_intr_accepted(struct acrn_vm *vm, uint32_t vector);
+void vpic_get_irq_trigger(struct acrn_vm *vm, uint32_t irq,
 	enum vpic_trigger *trigger);
 uint32_t vpic_pincount(void);

--- a/hypervisor/include/arch/x86/host_pm.h
+++ b/hypervisor/include/arch/x86/host_pm.h
@@ -13,8 +13,8 @@ extern struct pm_s_state_data host_pm_s_state;

 extern uint8_t host_enter_s3_success;

-int enter_s3(struct vm *vm, uint32_t pm1a_cnt_val, uint32_t pm1b_cnt_val);
-extern void asm_enter_s3(struct vm *vm, uint32_t pm1a_cnt_val,
+int enter_s3(struct acrn_vm *vm, uint32_t pm1a_cnt_val, uint32_t pm1b_cnt_val);
+extern void asm_enter_s3(struct acrn_vm *vm, uint32_t pm1a_cnt_val,
 		uint32_t pm1b_cnt_val);
 extern void restore_s3_context(void);

--- a/hypervisor/include/arch/x86/ioreq.h
+++ b/hypervisor/include/arch/x86/ioreq.h
@@ -48,14 +48,14 @@ struct vm_io_range {
 };

 struct vm_io_handler;
-struct vm;
+struct acrn_vm;
 struct acrn_vcpu;

 typedef
-uint32_t (*io_read_fn_t)(struct vm *vm, uint16_t port, size_t size);
+uint32_t (*io_read_fn_t)(struct acrn_vm *vm, uint16_t port, size_t size);

 typedef
-void (*io_write_fn_t)(struct vm *vm, uint16_t port, size_t size, uint32_t val);
+void (*io_write_fn_t)(struct acrn_vm *vm, uint16_t port, size_t size, uint32_t val);

 /**
 * @brief Describes a single IO handler description entry.
@@ -185,14 +185,14 @@ int32_t pio_instr_vmexit_handler(struct acrn_vcpu *vcpu);
 *
 * @param vm The VM whose I/O bitmaps are to be initialized
 */
-void   setup_io_bitmap(struct vm *vm);
+void   setup_io_bitmap(struct acrn_vm *vm);

 /**
 * @brief Free I/O bitmaps and port I/O handlers of \p vm
 *
 * @param vm The VM whose I/O bitmaps and handlers are to be freed
 */
-void   free_io_emulation_resource(struct vm *vm);
+void   free_io_emulation_resource(struct acrn_vm *vm);

 /**
 * @brief Allow a VM to access a port I/O range
@@ -204,7 +204,7 @@ void   free_io_emulation_resource(struct vm *vm);
 * @param port_address The start address of the port I/O range
 * @param nbytes The size of the range, in bytes
 */
-void   allow_guest_pio_access(struct vm *vm, uint16_t port_address,
+void   allow_guest_pio_access(struct acrn_vm *vm, uint16_t port_address,
 		uint32_t nbytes);

 /**
@@ -215,7 +215,7 @@ void   allow_guest_pio_access(struct vm *vm, uint16_t port_address,
 * @param io_read_fn_ptr The handler for emulating reads from the given range
 * @param io_write_fn_ptr The handler for emulating writes to the given range
 */
-void   register_io_emulation_handler(struct vm *vm, const struct vm_io_range *range,
+void   register_io_emulation_handler(struct acrn_vm *vm, const struct vm_io_range *range,
 		io_read_fn_t io_read_fn_ptr,
 		io_write_fn_t io_write_fn_ptr);

@@ -233,7 +233,7 @@ void   register_io_emulation_handler(struct vm *vm, const struct vm_io_range *ra
 * @return 0 - Registration succeeds
 * @return -EINVAL - \p read_write is NULL, \p end is not larger than \p start or \p vm has been launched
 */
-int register_mmio_emulation_handler(struct vm *vm,
+int register_mmio_emulation_handler(struct acrn_vm *vm,
 	hv_mem_io_handler_t read_write, uint64_t start,
 	uint64_t end, void *handler_private_data);

@@ -244,7 +244,7 @@ int register_mmio_emulation_handler(struct vm *vm,
 * @param start The base address of the range the to-be-unregistered handler is for
 * @param end The end of the range (exclusive) the to-be-unregistered handler is for
 */
-void unregister_mmio_emulation_handler(struct vm *vm, uint64_t start,
+void unregister_mmio_emulation_handler(struct acrn_vm *vm, uint64_t start,
        uint64_t end);

 /**
--- a/hypervisor/include/arch/x86/mmu.h
+++ b/hypervisor/include/arch/x86/mmu.h
@@ -160,7 +160,7 @@ void invept(const struct acrn_vcpu *vcpu);
 * @return true - The HPA of the guest memory region is continuous
 * @return false - The HPA of the guest memory region is non-continuous
 */
-bool check_continuous_hpa(struct vm *vm, uint64_t gpa_arg, uint64_t size_arg);
+bool check_continuous_hpa(struct acrn_vm *vm, uint64_t gpa_arg, uint64_t size_arg);
 /**
 *@pre (pml4_page != NULL) && (pg_size != NULL)
 */
@@ -214,7 +214,7 @@ static inline void clflush(volatile void *p)
 *
 * @return None
 */
-void destroy_ept(struct vm *vm);
+void destroy_ept(struct acrn_vm *vm);
 /**
 * @brief Translating from guest-physical address to host-physcial address
 *
@@ -224,7 +224,7 @@ void destroy_ept(struct vm *vm);
 * @return INVALID_HPA - the HPA of parameter gpa is unmapping
 * @return hpa - the HPA of parameter gpa is hpa
 */
-uint64_t gpa2hpa(struct vm *vm, uint64_t gpa);
+uint64_t gpa2hpa(struct acrn_vm *vm, uint64_t gpa);
 /**
 * @brief Translating from guest-physical address to host-physcial address
 *
@@ -236,7 +236,7 @@ uint64_t gpa2hpa(struct vm *vm, uint64_t gpa);
 * @return INVALID_HPA - the HPA of parameter gpa is unmapping
 * @return hpa - the HPA of parameter gpa is hpa
 */
-uint64_t local_gpa2hpa(struct vm *vm, uint64_t gpa, uint32_t *size);
+uint64_t local_gpa2hpa(struct acrn_vm *vm, uint64_t gpa, uint32_t *size);
 /**
 * @brief Translating from host-physical address to guest-physical address for VM0
 *
@@ -260,7 +260,7 @@ uint64_t vm0_hpa2gpa(uint64_t hpa);
 *
 * @return None
 */
-void ept_mr_add(struct vm *vm, uint64_t *pml4_page, uint64_t hpa,
+void ept_mr_add(struct acrn_vm *vm, uint64_t *pml4_page, uint64_t hpa,
 		uint64_t gpa, uint64_t size, uint64_t prot_orig);
 /**
 * @brief Guest-physical memory page access right or memory type updating
@@ -277,7 +277,7 @@ void ept_mr_add(struct vm *vm, uint64_t *pml4_page, uint64_t hpa,
 *
 * @return None
 */
-void ept_mr_modify(struct vm *vm, uint64_t *pml4_page, uint64_t gpa,
+void ept_mr_modify(struct acrn_vm *vm, uint64_t *pml4_page, uint64_t gpa,
 		uint64_t size, uint64_t prot_set, uint64_t prot_clr);
 /**
 * @brief Guest-physical memory region unmapping
@@ -292,7 +292,7 @@ void ept_mr_modify(struct vm *vm, uint64_t *pml4_page, uint64_t gpa,
 *
 * @pre [gpa,gpa+size) has been mapped into host physical memory region
 */
-void ept_mr_del(struct vm *vm, uint64_t *pml4_page, uint64_t gpa,
+void ept_mr_del(struct acrn_vm *vm, uint64_t *pml4_page, uint64_t gpa,
 		uint64_t size);
 /**
 * @brief EPT violation handling
--- a/hypervisor/include/arch/x86/multiboot.h
+++ b/hypervisor/include/arch/x86/multiboot.h
@@ -79,5 +79,5 @@ struct multiboot_module {
 };

 int parse_hv_cmdline(void);
-int init_vm_boot_info(struct vm *vm);
+int init_vm_boot_info(struct acrn_vm *vm);
 #endif
--- a/hypervisor/include/arch/x86/page.h
+++ b/hypervisor/include/arch/x86/page.h
@@ -60,6 +60,6 @@ struct memory_ops {
 };

 extern const struct memory_ops ppt_mem_ops;
-void init_ept_mem_ops(struct vm *vm);
+void init_ept_mem_ops(struct acrn_vm *vm);

 #endif /* PAGE_H */
--- a/hypervisor/include/arch/x86/sbl_seed_parse.h
+++ b/hypervisor/include/arch/x86/sbl_seed_parse.h
@@ -7,6 +7,6 @@
 #ifndef SBL_SEED_PARSE_H_
 #define SBL_SEED_PARSE_H_

-bool sbl_seed_parse(struct vm *vm, char *cmdline, char *out_arg, uint32_t out_len);
+bool sbl_seed_parse(struct acrn_vm *vm, char *cmdline, char *out_arg, uint32_t out_len);

 #endif /* SBL_SEED_PARSE_H_ */
--- a/hypervisor/include/arch/x86/trusty.h
+++ b/hypervisor/include/arch/x86/trusty.h
@@ -130,7 +130,7 @@ struct trusty_startup_param {

 void switch_world(struct acrn_vcpu *vcpu, int next_world);
 bool initialize_trusty(struct acrn_vcpu *vcpu, uint64_t param);
-void destroy_secure_world(struct vm *vm, bool need_clr_mem);
+void destroy_secure_world(struct acrn_vm *vm, bool need_clr_mem);
 void save_sworld_context(struct acrn_vcpu *vcpu);
 void restore_sworld_context(struct acrn_vcpu *vcpu);
 void trusty_set_dseed(const void *dseed, uint8_t dseed_num);
--- a/hypervisor/include/arch/x86/vtd.h
+++ b/hypervisor/include/arch/x86/vtd.h
@@ -610,7 +610,7 @@ int init_iommu(void);
 * @remark to reduce boot time & memory cost, a config IOMMU_INIT_BUS_LIMIT, which limit the bus number.
 *
 */
-void init_iommu_vm0_domain(struct vm *vm0);
+void init_iommu_vm0_domain(struct acrn_vm *vm0);

 /**
  * @}