OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

hv: vpci: remove vpci->vm not equal to null pre-condition 

In commit 0a7770cb, we remove vm pointer in vpci structrue. So there's no need
for such pre-condition since vpci is embedded in vm structure. The vm can't be
NULL Once the vpci is not NULL.

Tracked-On: #4550
Signed-off-by: Li Fei1 <fei1.li@intel.com>
Acked-by: Eddie Dong<eddie.dong@Intel.com>
This commit is contained in:
Li Fei1 2020-05-07 13:32:48 +08:00 committed by wenlingz
parent f9d26a80ed
commit 27c6f1c007
5 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,7 +35,6 @@
/*
* @pre vdev != NULL
* @pre vdev->vpci != NULL
* @pre vdev->vpci->vm != NULL
*/
static void vdev_pt_unmap_msix(struct pci_vdev *vdev)
{
@ -63,7 +62,6 @@ static void vdev_pt_unmap_msix(struct pci_vdev *vdev)
/*
* @pre vdev != NULL
* @pre vdev->vpci != NULL
* @pre vdev->vpci->vm != NULL
*/
void vdev_pt_map_msix(struct pci_vdev *vdev, bool hold_lock)
{
@ -89,7 +87,6 @@ void vdev_pt_map_msix(struct pci_vdev *vdev, bool hold_lock)
/**
* @pre vdev != NULL
* @pre vdev->vpci != NULL
* @pre vdev->vpci->vm != NULL
*/
static void vdev_pt_unmap_mem_vbar(struct pci_vdev *vdev, uint32_t idx)
{
@ -111,7 +108,6 @@ static void vdev_pt_unmap_mem_vbar(struct pci_vdev *vdev, uint32_t idx)
/**
* @pre vdev != NULL
* @pre vdev->vpci != NULL
* @pre vdev->vpci->vm != NULL
*/
static void vdev_pt_map_mem_vbar(struct pci_vdev *vdev, uint32_t idx)
{
@ -136,7 +132,6 @@ static void vdev_pt_map_mem_vbar(struct pci_vdev *vdev, uint32_t idx)
* @brief Allow IO bar access
* @pre vdev != NULL
* @pre vdev->vpci != NULL
* @pre vdev->vpci->vm != NULL
*/
static void vdev_pt_allow_io_vbar(struct pci_vdev *vdev, uint32_t idx)
{
@ -155,7 +150,6 @@ static void vdev_pt_allow_io_vbar(struct pci_vdev *vdev, uint32_t idx)
* @brief Deny IO bar access
* @pre vdev != NULL
* @pre vdev->vpci != NULL
* @pre vdev->vpci->vm != NULL
*/
static void vdev_pt_deny_io_vbar(struct pci_vdev *vdev, uint32_t idx)
{
@ -242,7 +236,6 @@ void vdev_pt_write_vbar(struct pci_vdev *vdev, uint32_t idx, uint32_t val)
*
* @pre vdev != NULL
* @pre vdev->vpci != NULL
* @pre vdev->vpci->vm != NULL
* @pre vdev->pdev != NULL
*
* @return None
@ -365,7 +358,6 @@ static void init_bars(struct pci_vdev *vdev, bool is_sriov_bar)
*
* @pre vdev != NULL
* @pre vdev->vpci != NULL
* @pre vdev->vpci->vm != NULL
* @pre vdev->pdev != NULL
*
* @return None

3
hypervisor/dm/vpci/vhostbridge.c
View File

@ -42,7 +42,6 @@
/**
* @pre vdev != NULL
* @pre vdev->vpci != NULL
* @pre vdev->vpci->vm != NULL
*/
static void init_vhostbridge(struct pci_vdev *vdev)
{
@ -101,7 +100,6 @@ static void deinit_vhostbridge(__unused struct pci_vdev *vdev)
/**
* @pre vdev != NULL
* @pre vdev->vpci != NULL
* @pre vdev->vpci->vm != NULL
*/
static int32_t read_vhostbridge_cfg(const struct pci_vdev *vdev, uint32_t offset,
uint32_t bytes, uint32_t *val)
@ -114,7 +112,6 @@ static int32_t read_vhostbridge_cfg(const struct pci_vdev *vdev, uint32_t offset
/**
* @pre vdev != NULL
* @pre vdev->vpci != NULL
* @pre vdev->vpci->vm != NULL
*/
static int32_t write_vhostbridge_cfg(struct pci_vdev *vdev, uint32_t offset,
uint32_t bytes, uint32_t val)

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

@ -57,7 +57,6 @@ static inline void enable_disable_msi(const struct pci_vdev *vdev, bool enable)
*
* @pre vdev != NULL
* @pre vdev->vpci != NULL
* @pre vdev->vpci->vm != NULL
* @pre vdev->pdev != NULL
*/
static void remap_vmsi(const struct pci_vdev *vdev)
@ -125,7 +124,6 @@ void write_vmsi_cfg(struct pci_vdev *vdev, uint32_t offset, uint32_t bytes, uint
/**
* @pre vdev != NULL
* @pre vdev->vpci != NULL
* @pre vdev->vpci->vm != NULL
*/
void deinit_vmsi(struct pci_vdev *vdev)
{

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

@ -72,7 +72,6 @@ static void mask_one_msix_vector(const struct pci_vdev *vdev, uint32_t index)
/**
* @pre vdev != NULL
* @pre vdev->vpci != NULL
* @pre vdev->vpci->vm != NULL
* @pre vdev->pdev != NULL
*/
static void remap_one_vmsix_entry(const struct pci_vdev *vdev, uint32_t index)
@ -260,7 +259,6 @@ void init_vmsix(struct pci_vdev *vdev)
/**
* @pre vdev != NULL
* @pre vdev->vpci != NULL
* @pre vdev->vpci->vm != NULL
*/
void deinit_vmsix(struct pci_vdev *vdev)
{

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

@ -299,8 +299,7 @@ void deinit_vpci(struct acrn_vm *vm)
/**
* @pre vdev != NULL
* @pre vdev->vpci != NULL
* @pre vdev->vpci->vm != NULL
* @pre vdev->vpci->vm->iommu != NULL
* @pre vpci2vm(vdev->vpci)->iommu != NULL
*/
static void assign_vdev_pt_iommu_domain(struct pci_vdev *vdev)
{
@ -317,8 +316,7 @@ static void assign_vdev_pt_iommu_domain(struct pci_vdev *vdev)
/**
* @pre vdev != NULL
* @pre vdev->vpci != NULL
* @pre vdev->vpci->vm != NULL
* @pre vdev->vpci->vm->iommu != NULL
* @pre vpci2vm(vdev->vpci)->iommu != NULL
*/
static void remove_vdev_pt_iommu_domain(const struct pci_vdev *vdev)
{
@ -351,7 +349,6 @@ static void remove_vdev_pt_iommu_domain(const struct pci_vdev *vdev)
* @param bdf Indicate the vdev's BDF
*
* @pre vpci != NULL
* @pre vpci->vm != NULL
*
* @return Return a available vdev instance, otherwise return NULL
*/