github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-15 13:59:18 +00:00
Code Issues Projects Releases Wiki Activity

HV:treewide:rename vm data structure

Browse Source 
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>
This commit is contained in:
Xiangyang Wu
2018-11-05 13:28:23 +08:00
committed by lijinxia
parent ace4f48c9a
commit 99586e32cc
66 changed files with 349 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
hypervisor/dm/vioapic.c
View File

@@ -126,7 +126,7 @@ vioapic_set_pinstate(struct acrn_vioapic *vioapic, uint16_t pin, uint32_t level)
* @return void
*/
void
vioapic_set_irq_nolock(struct vm *vm, uint32_t irq, uint32_t operation)
vioapic_set_irq_nolock(struct acrn_vm *vm, uint32_t irq, uint32_t operation)
{
struct acrn_vioapic *vioapic;
uint16_t pin = (uint16_t)irq;
@@ -169,7 +169,7 @@ vioapic_set_irq_nolock(struct vm *vm, uint32_t irq, uint32_t operation)
* @return void
*/
void
vioapic_set_irq(struct vm *vm, uint32_t irq, uint32_t operation)
vioapic_set_irq(struct acrn_vm *vm, uint32_t irq, uint32_t operation)
{
struct acrn_vioapic *vioapic = vm_ioapic(vm);
@@ -448,7 +448,7 @@ vioapic_mmio_rw(struct acrn_vioapic *vioapic, uint64_t gpa,
}
void
vioapic_process_eoi(struct vm *vm, uint32_t vector)
vioapic_process_eoi(struct acrn_vm *vm, uint32_t vector)
{
struct acrn_vioapic *vioapic;
uint32_t pin, pincount = vioapic_pincount(vm);
@@ -509,7 +509,7 @@ vioapic_reset(struct acrn_vioapic *vioapic)
}
void
vioapic_init(struct vm *vm)
vioapic_init(struct acrn_vm *vm)
{
vm->arch_vm.vioapic.vm = vm;
spinlock_init(&(vm->arch_vm.vioapic.mtx));
@@ -532,7 +532,7 @@ vioapic_cleanup(const struct acrn_vioapic *vioapic)
}
uint32_t
vioapic_pincount(const struct vm *vm)
vioapic_pincount(const struct acrn_vm *vm)
{
if (is_vm0(vm)) {
return REDIR_ENTRIES_HW;
@@ -543,7 +543,7 @@ vioapic_pincount(const struct vm *vm)
int vioapic_mmio_access_handler(struct io_request *io_req, void *handler_private_data)
{
struct vm *vm = (struct vm *)handler_private_data;
struct acrn_vm *vm = (struct acrn_vm *)handler_private_data;
struct acrn_vioapic *vioapic;
struct mmio_request *mmio = &io_req->reqs.mmio;
uint64_t gpa = mmio->address;
@@ -575,7 +575,7 @@ int vioapic_mmio_access_handler(struct io_request *io_req, void *handler_private
* @pre vm->arch_vm.vioapic != NULL
* @pre rte != NULL
*/
void vioapic_get_rte(struct vm *vm, uint32_t pin, union ioapic_rte *rte)
void vioapic_get_rte(struct acrn_vm *vm, uint32_t pin, union ioapic_rte *rte)
{
struct acrn_vioapic *vioapic;
@@ -591,7 +591,7 @@ void get_vioapic_info(char *str_arg, size_t str_max, uint16_t vmid)
union ioapic_rte rte;
uint32_t delmode, vector, dest;
bool level, phys, remote_irr, mask;
struct vm *vm = get_vm_from_vmid(vmid);
struct acrn_vm *vm = get_vm_from_vmid(vmid);
uint32_t pin, pincount;
if (vm == NULL) {

2
hypervisor/dm/vpci/msi.c
View File

@@ -43,7 +43,7 @@ static int vmsi_remap(struct pci_vdev *vdev, bool enable)
{
struct ptdev_msi_info info;
union pci_bdf pbdf = vdev->pdev.bdf;
struct vm *vm = vdev->vpci->vm;
struct acrn_vm *vm = vdev->vpci->vm;
uint32_t capoff = vdev->msi.capoff;
uint32_t msgctrl, msgdata;
uint32_t addrlo, addrhi;

4
hypervisor/dm/vpci/partition_mode.c
View File

@@ -49,7 +49,7 @@ static struct pci_vdev *partition_mode_find_vdev(struct vpci *vpci, union pci_bd
return NULL;
}
static int partition_mode_vpci_init(struct vm *vm)
static int partition_mode_vpci_init(struct acrn_vm *vm)
{
struct vpci_vdev_array *vdev_array;
struct vpci *vpci = &vm->vpci;
@@ -73,7 +73,7 @@ static int partition_mode_vpci_init(struct vm *vm)
return 0;
}
static void partition_mode_vpci_deinit(struct vm *vm)
static void partition_mode_vpci_deinit(struct acrn_vm *vm)
{
struct vpci_vdev_array *vdev_array;
struct pci_vdev *vdev;

6
hypervisor/dm/vpci/pci_pt.c
View File

@@ -56,7 +56,7 @@ static int vdev_pt_init_validate(struct pci_vdev *vdev)
static int vdev_pt_init(struct pci_vdev *vdev)
{
int ret;
struct vm *vm = vdev->vpci->vm;
struct acrn_vm *vm = vdev->vpci->vm;
uint16_t pci_command;
ret = vdev_pt_init_validate(vdev);
@@ -89,7 +89,7 @@ static int vdev_pt_init(struct pci_vdev *vdev)
static int vdev_pt_deinit(struct pci_vdev *vdev)
{
int ret;
struct vm *vm = vdev->vpci->vm;
struct acrn_vm *vm = vdev->vpci->vm;
ret = unassign_iommu_device(vm->iommu, vdev->pdev.bdf.bits.b,
(uint8_t)(vdev->pdev.bdf.value & 0xFFU));
@@ -119,7 +119,7 @@ static int vdev_pt_cfgread(struct pci_vdev *vdev, uint32_t offset,
static void vdev_pt_remap_bar(struct pci_vdev *vdev, uint32_t idx,
uint32_t new_base)
{
struct vm *vm = vdev->vpci->vm;
struct acrn_vm *vm = vdev->vpci->vm;
if (vdev->bar[idx].base != 0UL) {
ept_mr_del(vm, (uint64_t *)vm->arch_vm.nworld_eptp,

14
hypervisor/dm/vpci/sharing_mode.c
View File

@@ -104,7 +104,7 @@ static void sharing_mode_cfgwrite(__unused struct vpci *vpci, union pci_bdf bdf,
}
}
static struct pci_vdev *alloc_pci_vdev(struct vm *vm, union pci_bdf bdf)
static struct pci_vdev *alloc_pci_vdev(struct acrn_vm *vm, union pci_bdf bdf)
{
struct pci_vdev *vdev;
@@ -124,7 +124,7 @@ static struct pci_vdev *alloc_pci_vdev(struct vm *vm, union pci_bdf bdf)
static void enumerate_pci_dev(uint16_t pbdf, void *cb_data)
{
struct vm *vm = (struct vm *)cb_data;
struct acrn_vm *vm = (struct acrn_vm *)cb_data;
struct pci_vdev *vdev;
vdev = alloc_pci_vdev(vm, (union pci_bdf)pbdf);
@@ -133,7 +133,7 @@ static void enumerate_pci_dev(uint16_t pbdf, void *cb_data)
}
}
static int sharing_mode_vpci_init(struct vm *vm)
static int sharing_mode_vpci_init(struct acrn_vm *vm)
{
struct pci_vdev *vdev;
uint32_t i, j;
@@ -165,7 +165,7 @@ static int sharing_mode_vpci_init(struct vm *vm)
return 0;
}
static void sharing_mode_vpci_deinit(__unused struct vm *vm)
static void sharing_mode_vpci_deinit(__unused struct acrn_vm *vm)
{
struct pci_vdev *vdev;
uint32_t i, j;
@@ -201,7 +201,7 @@ struct vpci_ops sharing_mode_vpci_ops = {
.cfgwrite = sharing_mode_cfgwrite,
};
void vpci_set_ptdev_intr_info(struct vm *target_vm, uint16_t vbdf, uint16_t pbdf)
void vpci_set_ptdev_intr_info(struct acrn_vm *target_vm, uint16_t vbdf, uint16_t pbdf)
{
struct pci_vdev *vdev;
@@ -218,10 +218,10 @@ void vpci_set_ptdev_intr_info(struct vm *target_vm, uint16_t vbdf, uint16_t pbdf
vdev->pdev.bdf.value = pbdf;
}
void vpci_reset_ptdev_intr_info(struct vm *target_vm, uint16_t vbdf, uint16_t pbdf)
void vpci_reset_ptdev_intr_info(struct acrn_vm *target_vm, uint16_t vbdf, uint16_t pbdf)
{
struct pci_vdev *vdev;
struct vm *vm;
struct acrn_vm *vm;
vdev = sharing_mode_find_vdev((union pci_bdf)pbdf);
if (vdev == NULL) {

8
hypervisor/dm/vpci/vpci.c
View File

@@ -48,7 +48,7 @@ static void pci_cfg_clear_cache(struct pci_addr_info *pi)
pi->cached_enable = 0U;
}
static uint32_t pci_cfg_io_read(struct vm *vm, uint16_t addr, size_t bytes)
static uint32_t pci_cfg_io_read(struct acrn_vm *vm, uint16_t addr, size_t bytes)
{
uint32_t val = 0xFFFFFFFFU;
struct vpci *vpci = &vm->vpci;
@@ -82,7 +82,7 @@ static uint32_t pci_cfg_io_read(struct vm *vm, uint16_t addr, size_t bytes)
return val;
}
static void pci_cfg_io_write(struct vm *vm, uint16_t addr, size_t bytes,
static void pci_cfg_io_write(struct acrn_vm *vm, uint16_t addr, size_t bytes,
uint32_t val)
{
struct vpci *vpci = &vm->vpci;
@@ -114,7 +114,7 @@ static void pci_cfg_io_write(struct vm *vm, uint16_t addr, size_t bytes,
}
}
void vpci_init(struct vm *vm)
void vpci_init(struct acrn_vm *vm)
{
struct vpci *vpci = &vm->vpci;
struct vm_io_range pci_cfg_range = {
@@ -143,7 +143,7 @@ void vpci_init(struct vm *vm)
}
}
void vpci_cleanup(struct vm *vm)
void vpci_cleanup(struct acrn_vm *vm)
{
struct vpci *vpci = &vm->vpci;

30
hypervisor/dm/vpic.c
View File

@@ -448,7 +448,7 @@ static void vpic_set_pinstate(struct acrn_vpic *vpic, uint8_t pin,
*
* @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)
{
struct acrn_vpic *vpic;
struct i8259_reg_state *i8259;
@@ -501,7 +501,7 @@ vpic_pincount(void)
* @pre vm->vpic != NULL
* @pre irq < NR_VPIC_PINS_TOTAL
*/
void vpic_get_irq_trigger(struct vm *vm, uint32_t irq,
void vpic_get_irq_trigger(struct acrn_vm *vm, uint32_t irq,
enum vpic_trigger *trigger)
{
struct acrn_vpic *vpic;
@@ -524,7 +524,7 @@ void vpic_get_irq_trigger(struct vm *vm, uint32_t irq,
*
* @return void.
*/
void vpic_pending_intr(struct vm *vm, uint32_t *vecptr)
void vpic_pending_intr(struct acrn_vm *vm, uint32_t *vecptr)
{
struct acrn_vpic *vpic;
struct i8259_reg_state *i8259;
@@ -587,7 +587,7 @@ static void vpic_pin_accepted(struct i8259_reg_state *i8259, uint8_t pin)
*
* @pre vm != NULL
*/
void vpic_intr_accepted(struct vm *vm, uint32_t vector)
void vpic_intr_accepted(struct acrn_vm *vm, uint32_t vector)
{
struct acrn_vpic *vpic;
uint8_t pin;
@@ -699,7 +699,7 @@ static int vpic_write(struct acrn_vpic *vpic, struct i8259_reg_state *i8259,
return error;
}
static int vpic_master_handler(struct vm *vm, bool in, uint16_t port,
static int vpic_master_handler(struct acrn_vm *vm, bool in, uint16_t port,
size_t bytes, uint32_t *eax)
{
struct acrn_vpic *vpic;
@@ -719,7 +719,7 @@ static int vpic_master_handler(struct vm *vm, bool in, uint16_t port,
return vpic_write(vpic, i8259, port, eax);
}
static uint32_t vpic_master_io_read(struct vm *vm, uint16_t addr, size_t width)
static uint32_t vpic_master_io_read(struct acrn_vm *vm, uint16_t addr, size_t width)
{
uint32_t val = 0U;
@@ -730,7 +730,7 @@ static uint32_t vpic_master_io_read(struct vm *vm, uint16_t addr, size_t width)
return val;
}
static void vpic_master_io_write(struct vm *vm, uint16_t addr, size_t width,
static void vpic_master_io_write(struct acrn_vm *vm, uint16_t addr, size_t width,
uint32_t v)
{
uint32_t val = v;
@@ -741,7 +741,7 @@ static void vpic_master_io_write(struct vm *vm, uint16_t addr, size_t width,
}
}
static int vpic_slave_handler(struct vm *vm, bool in, uint16_t port,
static int vpic_slave_handler(struct acrn_vm *vm, bool in, uint16_t port,
size_t bytes, uint32_t *eax)
{
struct acrn_vpic *vpic;
@@ -761,7 +761,7 @@ static int vpic_slave_handler(struct vm *vm, bool in, uint16_t port,
return vpic_write(vpic, i8259, port, eax);
}
static uint32_t vpic_slave_io_read(struct vm *vm, uint16_t addr, size_t width)
static uint32_t vpic_slave_io_read(struct acrn_vm *vm, uint16_t addr, size_t width)
{
uint32_t val = 0U;
@@ -772,7 +772,7 @@ static uint32_t vpic_slave_io_read(struct vm *vm, uint16_t addr, size_t width)
return val;
}
static void vpic_slave_io_write(struct vm *vm, uint16_t addr, size_t width,
static void vpic_slave_io_write(struct acrn_vm *vm, uint16_t addr, size_t width,
uint32_t v)
{
uint32_t val = v;
@@ -783,7 +783,7 @@ static void vpic_slave_io_write(struct vm *vm, uint16_t addr, size_t width,
}
}
static int vpic_elc_handler(struct vm *vm, bool in, uint16_t port, size_t bytes,
static int vpic_elc_handler(struct acrn_vm *vm, bool in, uint16_t port, size_t bytes,
uint32_t *eax)
{
struct acrn_vpic *vpic;
@@ -827,7 +827,7 @@ static int vpic_elc_handler(struct vm *vm, bool in, uint16_t port, size_t bytes,
return 0;
}
static uint32_t vpic_elc_io_read(struct vm *vm, uint16_t addr, size_t width)
static uint32_t vpic_elc_io_read(struct acrn_vm *vm, uint16_t addr, size_t width)
{
uint32_t val = 0U;
@@ -837,7 +837,7 @@ static uint32_t vpic_elc_io_read(struct vm *vm, uint16_t addr, size_t width)
return val;
}
static void vpic_elc_io_write(struct vm *vm, uint16_t addr, size_t width,
static void vpic_elc_io_write(struct acrn_vm *vm, uint16_t addr, size_t width,
uint32_t v)
{
uint32_t val = v;
@@ -848,7 +848,7 @@ static void vpic_elc_io_write(struct vm *vm, uint16_t addr, size_t width,
}
}
static void vpic_register_io_handler(struct vm *vm)
static void vpic_register_io_handler(struct acrn_vm *vm)
{
struct vm_io_range master_range = {
.flags = IO_ATTR_RW,
@@ -874,7 +874,7 @@ static void vpic_register_io_handler(struct vm *vm)
&vpic_elc_io_read, &vpic_elc_io_write);
}
void vpic_init(struct vm *vm)
void vpic_init(struct acrn_vm *vm)
{
struct acrn_vpic *vpic = vm_pic(vm);
vpic_register_io_handler(vm);

6
hypervisor/dm/vrtc.c
View File

@@ -42,7 +42,7 @@ static uint8_t cmos_get_reg_val(uint8_t addr)
return reg;
}
static uint32_t vrtc_read(struct vm *vm, uint16_t addr, __unused size_t width)
static uint32_t vrtc_read(struct acrn_vm *vm, uint16_t addr, __unused size_t width)
{
uint8_t reg;
uint8_t offset;
@@ -57,7 +57,7 @@ static uint32_t vrtc_read(struct vm *vm, uint16_t addr, __unused size_t width)
return reg;
}
static void vrtc_write(struct vm *vm, uint16_t addr, size_t width,
static void vrtc_write(struct acrn_vm *vm, uint16_t addr, size_t width,
uint32_t value)
{
@@ -69,7 +69,7 @@ static void vrtc_write(struct vm *vm, uint16_t addr, size_t width,
}
}
void vrtc_init(struct vm *vm)
void vrtc_init(struct acrn_vm *vm)
{
struct vm_io_range range = {
.flags = IO_ATTR_RW, .base = CMOS_ADDR_PORT, .len = 2U};