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>

Author: Xiangyang Wu

hypervisor/arch/x86/assign.c

@@ -17,7 +17,7 @@
  */
 static inline struct ptdev_remapping_info *
 ptdev_lookup_entry_by_sid(uint32_t intr_type,
-		const union source_id *sid,const struct vm *vm)
+		const union source_id *sid,const struct acrn_vm *vm)
 {
 	struct ptdev_remapping_info *entry;
 	struct list_head *pos;
@@ -43,7 +43,7 @@ is_entry_active(const struct ptdev_remapping_info *entry)
 	return atomic_load32(&entry->active) == ACTIVE_FLAG;
 }
 
-static bool ptdev_hv_owned_intx(const struct vm *vm, const union source_id *virt_sid)
+static bool ptdev_hv_owned_intx(const struct acrn_vm *vm, const union source_id *virt_sid)
 {
 	/* vm0 vuart pin is owned by hypervisor under debug version */
 	if (is_vm0(vm) && (virt_sid->intx_id.pin == COM1_IRQ)) {
@@ -68,7 +68,7 @@ static uint64_t calculate_logical_dest_mask(uint64_t pdmask)
 	return dest_mask;
 }
 
-static void ptdev_build_physical_msi(struct vm *vm, struct ptdev_msi_info *info,
+static void ptdev_build_physical_msi(struct acrn_vm *vm, struct ptdev_msi_info *info,
 		uint32_t vector)
 {
 	uint64_t vdmask, pdmask, dest_mask;
@@ -105,7 +105,7 @@ static void ptdev_build_physical_msi(struct vm *vm, struct ptdev_msi_info *info,
 }
 
 static union ioapic_rte
-ptdev_build_physical_rte(struct vm *vm,
+ptdev_build_physical_rte(struct acrn_vm *vm,
 		struct ptdev_remapping_info *entry)
 {
 	union ioapic_rte rte;
@@ -191,7 +191,7 @@ ptdev_build_physical_rte(struct vm *vm,
  * - if the entry already be added by other vm, return NULL
  */
 static struct ptdev_remapping_info *
-add_msix_remapping(struct vm *vm, uint16_t virt_bdf, uint16_t phys_bdf,
+add_msix_remapping(struct acrn_vm *vm, uint16_t virt_bdf, uint16_t phys_bdf,
 		uint32_t entry_nr)
 {
 	struct ptdev_remapping_info *entry;
@@ -246,7 +246,7 @@ add_msix_remapping(struct vm *vm, uint16_t virt_bdf, uint16_t phys_bdf,
 
 /* deactive & remove mapping entry of vbdf:entry_nr for vm */
 static void
-remove_msix_remapping(const struct vm *vm, uint16_t virt_bdf, uint32_t entry_nr)
+remove_msix_remapping(const struct acrn_vm *vm, uint16_t virt_bdf, uint32_t entry_nr)
 {
 	struct ptdev_remapping_info *entry;
 	DEFINE_MSI_SID(virt_sid, virt_bdf, entry_nr);
@@ -280,7 +280,7 @@ remove_msix_remapping(const struct vm *vm, uint16_t virt_bdf, uint32_t entry_nr)
  * - if the entry already be added by other vm, return NULL
  */
 static struct ptdev_remapping_info *
-add_intx_remapping(struct vm *vm, uint8_t virt_pin,
+add_intx_remapping(struct acrn_vm *vm, uint8_t virt_pin,
 		uint8_t phys_pin, bool pic_pin)
 {
 	struct ptdev_remapping_info *entry;
@@ -340,7 +340,7 @@ add_intx_remapping(struct vm *vm, uint8_t virt_pin,
 }
 
 /* deactive & remove mapping entry of vpin for vm */
-static void remove_intx_remapping(const struct vm *vm, uint8_t virt_pin, bool pic_pin)
+static void remove_intx_remapping(const struct acrn_vm *vm, uint8_t virt_pin, bool pic_pin)
 {
 	uint32_t phys_irq;
 	struct ptdev_remapping_info *entry;
@@ -375,7 +375,7 @@ static void remove_intx_remapping(const struct vm *vm, uint8_t virt_pin, bool pi
 	spinlock_release(&ptdev_lock);
 }
 
-static void ptdev_intr_handle_irq(struct vm *vm,
+static void ptdev_intr_handle_irq(struct acrn_vm *vm,
 		const struct ptdev_remapping_info *entry)
 {
 	const union source_id *virt_sid = &entry->virt_sid;
@@ -443,7 +443,7 @@ static void ptdev_intr_handle_irq(struct vm *vm,
 void ptdev_softirq(uint16_t pcpu_id)
 {
 	struct acrn_vcpu *vcpu = (struct acrn_vcpu *)per_cpu(vcpu, pcpu_id);
-	struct vm *vm = vcpu->vm;
+	struct acrn_vm *vm = vcpu->vm;
 
 	while (1) {
 		struct ptdev_remapping_info *entry = ptdev_dequeue_softirq(vm);
@@ -482,7 +482,7 @@ void ptdev_softirq(uint16_t pcpu_id)
 	}
 }
 
-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)
 {
 	uint32_t phys_irq;
@@ -533,7 +533,7 @@ void ptdev_intx_ack(struct vm *vm, uint8_t virt_pin,
  *
  * This function is called by SOS pci MSI config routine through hcall
  */
-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)
 {
 	struct ptdev_remapping_info *entry;
@@ -589,7 +589,7 @@ int ptdev_msix_remap(struct vm *vm, uint16_t virt_bdf,
 	return 0;
 }
 
-static void activate_physical_ioapic(struct vm *vm,
+static void activate_physical_ioapic(struct acrn_vm *vm,
 		struct ptdev_remapping_info *entry)
 {
 	union ioapic_rte rte;
@@ -622,7 +622,7 @@ static void activate_physical_ioapic(struct vm *vm,
 /* Main entry for PCI/Legacy device assignment with INTx, calling from vIOAPIC
  * or vPIC
  */
-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)
 {
 	struct ptdev_remapping_info *entry;
@@ -729,7 +729,7 @@ int ptdev_intx_pin_remap(struct vm *vm, uint8_t virt_pin,
  * - currently, one phys_pin can only be held by one pin source (vPIC or
  *   vIOAPIC)
  */
-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)
 {
 	struct ptdev_remapping_info *entry;
@@ -748,7 +748,7 @@ int ptdev_add_intx_remapping(struct vm *vm, uint8_t virt_pin, uint8_t phys_pin,
 /*
  * @pre vm != NULL
  */
-void ptdev_remove_intx_remapping(const struct vm *vm, uint8_t virt_pin, bool pic_pin)
+void ptdev_remove_intx_remapping(const struct acrn_vm *vm, uint8_t virt_pin, bool pic_pin)
 {
 	remove_intx_remapping(vm, virt_pin, pic_pin);
 }
@@ -758,7 +758,7 @@ void ptdev_remove_intx_remapping(const struct vm *vm, uint8_t virt_pin, bool pic
  * - the entry is identified by phys_bdf:msi_idx:
  *   one entry vs. one phys_bdf:msi_idx
  */
-int ptdev_add_msix_remapping(struct vm *vm, uint16_t virt_bdf,
+int ptdev_add_msix_remapping(struct acrn_vm *vm, uint16_t virt_bdf,
 		uint16_t phys_bdf, uint32_t vector_count)
 {
 	struct ptdev_remapping_info *entry;
@@ -777,7 +777,7 @@ int ptdev_add_msix_remapping(struct vm *vm, uint16_t virt_bdf,
 /*
  * @pre vm != NULL
  */
-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)
 {
 	uint32_t i;

hypervisor/arch/x86/cpuid.c

@@ -11,7 +11,7 @@ static inline struct vcpuid_entry *find_vcpuid_entry(const struct acrn_vcpu *vcp
 {
 	uint32_t i = 0U, nr, half;
 	struct vcpuid_entry *entry = NULL;
-	struct vm *vm = vcpu->vm;
+	struct acrn_vm *vm = vcpu->vm;
 	uint32_t leaf = leaf_arg;
 
 	nr = vm->vcpuid_entry_nr;
@@ -63,7 +63,7 @@ static inline struct vcpuid_entry *find_vcpuid_entry(const struct acrn_vcpu *vcp
 	return entry;
 }
 
-static inline int set_vcpuid_entry(struct vm *vm,
+static inline int set_vcpuid_entry(struct acrn_vm *vm,
 				const struct vcpuid_entry *entry)
 {
 	struct vcpuid_entry *tmp;
@@ -170,7 +170,7 @@ static void init_vcpuid_entry(uint32_t leaf, uint32_t subleaf,
 	}
 }
 
-int set_vcpuid_entries(struct vm *vm)
+int set_vcpuid_entries(struct acrn_vm *vm)
 {
 	int result;
 	struct vcpuid_entry entry;

hypervisor/arch/x86/ept.c

@@ -10,7 +10,7 @@
 
 #define ACRN_DBG_EPT	6U
 
-void destroy_ept(struct vm *vm)
+void destroy_ept(struct acrn_vm *vm)
 {
 	/* Destroy secure world */
 	if (vm->sworld_control.flag.active != 0UL) {
@@ -23,7 +23,7 @@ void destroy_ept(struct vm *vm)
 }
 
 /* using return value INVALID_HPA as error code */
-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)
 {
 	uint64_t hpa = INVALID_HPA;
 	uint64_t *pgentry, pg_size = 0UL;
@@ -58,7 +58,7 @@ uint64_t local_gpa2hpa(struct vm *vm, uint64_t gpa, uint32_t *size)
 }
 
 /* using return value INVALID_HPA as error code */
-uint64_t gpa2hpa(struct vm *vm, uint64_t gpa)
+uint64_t gpa2hpa(struct acrn_vm *vm, uint64_t gpa)
 {
 	return local_gpa2hpa(vm, gpa, NULL);
 }
@@ -178,7 +178,7 @@ int ept_misconfig_vmexit_handler(__unused struct acrn_vcpu *vcpu)
 	return status;
 }
 
-void ept_mr_add(struct vm *vm, uint64_t *pml4_page,
+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)
 {
 	uint16_t i;
@@ -203,7 +203,7 @@ void ept_mr_add(struct vm *vm, uint64_t *pml4_page,
 	}
 }
 
-void ept_mr_modify(struct vm *vm, uint64_t *pml4_page,
+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)
 {
@@ -221,7 +221,7 @@ void ept_mr_modify(struct vm *vm, uint64_t *pml4_page,
 /**
  * @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, uint64_t size)
+void ept_mr_del(struct acrn_vm *vm, uint64_t *pml4_page, uint64_t gpa, uint64_t size)
 {
 	struct acrn_vcpu *vcpu;
 	uint16_t i;

hypervisor/arch/x86/guest/guest.c

@@ -32,7 +32,7 @@ struct page_walk_info {
 	bool is_smep_on;
 };
 
-uint64_t vcpumask2pcpumask(struct vm *vm, uint64_t vdmask)
+uint64_t vcpumask2pcpumask(struct acrn_vm *vm, uint64_t vdmask)
 {
 	uint16_t vcpu_id;
 	uint64_t dmask = 0UL;
@@ -327,7 +327,7 @@ int gva2gpa(struct acrn_vcpu *vcpu, uint64_t gva, uint64_t *gpa,
 	return ret;
 }
 
-static inline uint32_t local_copy_gpa(struct vm *vm, void *h_ptr, uint64_t gpa,
+static inline uint32_t local_copy_gpa(struct acrn_vm *vm, void *h_ptr, uint64_t gpa,
 	uint32_t size, uint32_t fix_pg_size, bool cp_from_vm)
 {
 	uint64_t hpa;
@@ -360,7 +360,7 @@ static inline uint32_t local_copy_gpa(struct vm *vm, void *h_ptr, uint64_t gpa,
 	return len;
 }
 
-static inline int copy_gpa(struct vm *vm, void *h_ptr_arg, uint64_t gpa_arg,
+static inline int copy_gpa(struct acrn_vm *vm, void *h_ptr_arg, uint64_t gpa_arg,
 	uint32_t size_arg, bool cp_from_vm)
 {
 	void *h_ptr = h_ptr_arg;
@@ -427,7 +427,7 @@ static inline int copy_gva(struct acrn_vcpu *vcpu, void *h_ptr_arg, uint64_t gva
  *   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)
 {
 	return copy_gpa(vm, h_ptr, gpa, size, 1);
 }
@@ -438,7 +438,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)
 {
 	return copy_gpa(vm, h_ptr, gpa, size, 0);
 }
@@ -606,7 +606,7 @@ static void rebuild_vm0_e820(void)
  * @pre vm != NULL
  * @pre is_vm0(vm) == true
  */
-int prepare_vm0_memmap_and_e820(struct vm *vm)
+int prepare_vm0_memmap_and_e820(struct acrn_vm *vm)
 {
 	uint32_t i;
 	uint64_t attr_uc = (EPT_RWX | EPT_UNCACHED);

hypervisor/arch/x86/guest/mptable.c

@@ -288,7 +288,7 @@ static uint8_t mpt_compute_checksum(void *base, size_t len)
 	return (256U - sum);
 }
 
-int mptable_build(struct vm *vm)
+int mptable_build(struct acrn_vm *vm)
 {
 	char                    *startaddr;
 	char                    *curraddr;

hypervisor/arch/x86/guest/pm.c

@@ -6,7 +6,7 @@
 
 #include <hypervisor.h>
 
-int validate_pstate(const struct vm *vm, uint64_t perf_ctl)
+int validate_pstate(const struct acrn_vm *vm, uint64_t perf_ctl)
 {
 	const struct cpu_px_data *px_data;
 	int i, px_cnt;
@@ -31,7 +31,7 @@ int validate_pstate(const struct vm *vm, uint64_t perf_ctl)
 	return -1;
 }
 
-static void vm_setup_cpu_px(struct vm *vm)
+static void vm_setup_cpu_px(struct acrn_vm *vm)
 {
 	uint32_t px_data_size;
 
@@ -56,7 +56,7 @@ static void vm_setup_cpu_px(struct vm *vm)
 
 }
 
-static void vm_setup_cpu_cx(struct vm *vm)
+static void vm_setup_cpu_cx(struct acrn_vm *vm)
 {
 	uint32_t cx_data_size;
 
@@ -84,7 +84,7 @@ static void vm_setup_cpu_cx(struct vm *vm)
 
 }
 
-static inline void init_cx_port(struct vm *vm)
+static inline void init_cx_port(struct acrn_vm *vm)
 {
 	uint8_t cx_idx;
 
@@ -99,7 +99,7 @@ static inline void init_cx_port(struct vm *vm)
 	}
 }
 
-void vm_setup_cpu_state(struct vm *vm)
+void vm_setup_cpu_state(struct acrn_vm *vm)
 {
 	vm_setup_cpu_px(vm);
 	vm_setup_cpu_cx(vm);
@@ -109,7 +109,7 @@ void vm_setup_cpu_state(struct vm *vm)
 /* This function is for power management Sx state implementation,
  * VM need to load the Sx state data to implement S3/S5.
  */
-int vm_load_pm_s_state(struct vm *vm)
+int vm_load_pm_s_state(struct acrn_vm *vm)
 {
 #ifdef ACPI_INFO_VALIDATED
 	vm->pm.sx_state_data = (struct pm_s_state_data *)&host_pm_s_state;
@@ -132,7 +132,7 @@ static inline uint8_t get_slp_typx(uint32_t pm1_cnt)
 	return (uint8_t)((pm1_cnt & 0x1fffU) >> BIT_SLP_TYPx);
 }
 
-static uint32_t pm1ab_io_read(__unused struct vm *vm, uint16_t addr,
+static uint32_t pm1ab_io_read(__unused struct acrn_vm *vm, uint16_t addr,
 			size_t width)
 {
 	uint32_t val = pio_read(addr, width);
@@ -148,7 +148,7 @@ static uint32_t pm1ab_io_read(__unused struct vm *vm, uint16_t addr,
 	return val;
 }
 
-static void pm1ab_io_write(__unused struct vm *vm, uint16_t addr, size_t width,
+static void pm1ab_io_write(__unused struct acrn_vm *vm, uint16_t addr, size_t width,
 			uint32_t v)
 {
 	static uint32_t pm1a_cnt_ready = 0U;
@@ -187,7 +187,7 @@ static void pm1ab_io_write(__unused struct vm *vm, uint16_t addr, size_t width,
 }
 
 static void
-register_gas_io_handler(struct vm *vm, const struct acpi_generic_address *gas)
+register_gas_io_handler(struct acrn_vm *vm, const struct acpi_generic_address *gas)
 {
 	uint8_t io_len[5] = {0, 1, 2, 4, 8};
 	struct vm_io_range gas_io;
@@ -210,7 +210,7 @@ register_gas_io_handler(struct vm *vm, const struct acpi_generic_address *gas)
 			vm->vm_id, gas_io.base, gas_io.len);
 }
 
-void register_pm1ab_handler(struct vm *vm)
+void register_pm1ab_handler(struct acrn_vm *vm)
 {
 	struct pm_s_state_data *sx_data = vm->pm.sx_state_data;