github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-21 00:38:28 +00:00
Code Issues Projects Releases Wiki Activity

hv: MISRA-C fix "identifier reuse" in vpci code

Browse Source 
13X: Identifier reuse: tag vs component.
A tag name shall be a unique identifier

Change the following names:
  struct msi --> struct pci_msi
  struct msix --> struct pci_msix
  struct vpci --> struct acrn_vpci
  union cfgdata -> union pci_cfgdata

Tracked-On: #861
Signed-off-by: Zide Chen <zide.chen@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Zide Chen
2018-12-13 22:50:56 -08:00
committed by wenlingz
parent 2ddd24e022
commit 2028034151
6 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -353,7 +353,7 @@ static int32_t vmsix_init(struct pci_vdev *vdev)
uint32_t msgctrl;
uint32_t table_info, i;
uint64_t addr_hi, addr_lo;
struct msix *msix = &vdev->msix;
struct pci_msix *msix = &vdev->msix;
int32_t ret;
msgctrl = pci_pdev_read_cfg(vdev->pdev.bdf, vdev->msix.capoff + PCIR_MSIX_CTRL, 2U);

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

@@ -32,7 +32,7 @@
#include <hypervisor.h>
#include "pci_priv.h"
static struct pci_vdev *partition_mode_find_vdev(struct vpci *vpci, union pci_bdf vbdf)
static struct pci_vdev *partition_mode_find_vdev(struct acrn_vpci *vpci, union pci_bdf vbdf)
{
struct vpci_vdev_array *vdev_array;
struct pci_vdev *vdev;
@@ -52,7 +52,7 @@ static struct pci_vdev *partition_mode_find_vdev(struct vpci *vpci, union pci_bd
static int32_t partition_mode_vpci_init(struct acrn_vm *vm)
{
struct vpci_vdev_array *vdev_array;
struct vpci *vpci = &vm->vpci;
struct acrn_vpci *vpci = &vm->vpci;
struct pci_vdev *vdev;
int32_t i;
@@ -91,7 +91,7 @@ static void partition_mode_vpci_deinit(struct acrn_vm *vm)
}
}
static void partition_mode_cfgread(struct vpci *vpci, union pci_bdf vbdf,
static void partition_mode_cfgread(struct acrn_vpci *vpci, union pci_bdf vbdf,
uint32_t offset, uint32_t bytes, uint32_t *val)
{
struct pci_vdev *vdev = partition_mode_find_vdev(vpci, vbdf);
@@ -101,7 +101,7 @@ static void partition_mode_cfgread(struct vpci *vpci, union pci_bdf vbdf,
}
}
static void partition_mode_cfgwrite(struct vpci *vpci, union pci_bdf vbdf,
static void partition_mode_cfgwrite(struct acrn_vpci *vpci, union pci_bdf vbdf,
uint32_t offset, uint32_t bytes, uint32_t val)
{
struct pci_vdev *vdev = partition_mode_find_vdev(vpci, vbdf);

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

@@ -47,7 +47,7 @@ struct pci_vdev *sharing_mode_find_vdev(union pci_bdf pbdf)
return NULL;
}
static void sharing_mode_cfgread(__unused struct vpci *vpci, union pci_bdf bdf,
static void sharing_mode_cfgread(__unused struct acrn_vpci *vpci, union pci_bdf bdf,
uint32_t offset, uint32_t bytes, uint32_t *val)
{
struct pci_vdev *vdev;
@@ -75,7 +75,7 @@ static void sharing_mode_cfgread(__unused struct vpci *vpci, union pci_bdf bdf,
}
}
static void sharing_mode_cfgwrite(__unused struct vpci *vpci, union pci_bdf bdf,
static void sharing_mode_cfgwrite(__unused struct acrn_vpci *vpci, union pci_bdf bdf,
uint32_t offset, uint32_t bytes, uint32_t val)
{
struct pci_vdev *vdev;

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

@@ -40,7 +40,7 @@ static void pci_cfg_clear_cache(struct pci_addr_info *pi)
static uint32_t pci_cfgaddr_io_read(struct acrn_vm *vm, uint16_t addr, size_t bytes)
{
uint32_t val = ~0U;
struct vpci *vpci = &vm->vpci;
struct acrn_vpci *vpci = &vm->vpci;
struct pci_addr_info *pi = &vpci->addr_info;
if ((addr == (uint16_t)PCI_CONFIG_ADDR) && (bytes == 4U)) {
@@ -57,7 +57,7 @@ static uint32_t pci_cfgaddr_io_read(struct acrn_vm *vm, uint16_t addr, size_t by
static void pci_cfgaddr_io_write(struct acrn_vm *vm, uint16_t addr, size_t bytes, uint32_t val)
{
struct vpci *vpci = &vm->vpci;
struct acrn_vpci *vpci = &vm->vpci;
struct pci_addr_info *pi = &vpci->addr_info;
if ((addr == (uint16_t)PCI_CONFIG_ADDR) && (bytes == 4U)) {
@@ -69,7 +69,7 @@ static void pci_cfgaddr_io_write(struct acrn_vm *vm, uint16_t addr, size_t bytes
static uint32_t pci_cfgdata_io_read(struct acrn_vm *vm, uint16_t addr, size_t bytes)
{
struct vpci *vpci = &vm->vpci;
struct acrn_vpci *vpci = &vm->vpci;
struct pci_addr_info *pi = &vpci->addr_info;
uint16_t offset = addr - PCI_CONFIG_DATA;
uint32_t val = ~0U;
@@ -86,7 +86,7 @@ static uint32_t pci_cfgdata_io_read(struct acrn_vm *vm, uint16_t addr, size_t by
static void pci_cfgdata_io_write(struct acrn_vm *vm, uint16_t addr, size_t bytes, uint32_t val)
{
struct vpci *vpci = &vm->vpci;
struct acrn_vpci *vpci = &vm->vpci;
struct pci_addr_info *pi = &vpci->addr_info;
uint16_t offset = addr - PCI_CONFIG_DATA;
@@ -100,7 +100,7 @@ static void pci_cfgdata_io_write(struct acrn_vm *vm, uint16_t addr, size_t bytes
void vpci_init(struct acrn_vm *vm)
{
struct vpci *vpci = &vm->vpci;
struct acrn_vpci *vpci = &vm->vpci;
struct vm_io_range pci_cfgaddr_range = {
.flags = IO_ATTR_RW,
@@ -139,7 +139,7 @@ void vpci_init(struct acrn_vm *vm)
void vpci_cleanup(struct acrn_vm *vm)
{
struct vpci *vpci = &vm->vpci;
struct acrn_vpci *vpci = &vm->vpci;
if ((vpci->ops != NULL) && (vpci->ops->deinit != NULL)) {
vpci->ops->deinit(vm);