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

HV: declare and export partition mode's vdev functions as global instead of static local 

Export the following functions as global instead of static so that they can be
called/referred outside of the files where they are declared:

vdev_pt_init
vdev_pt_deinit
vdev_pt_cfgread
vdev_pt_cfgwrite
vdev_hostbridge_init
vdev_hostbridge_deinit
vdev_hostbridge_cfgread
vdev_hostbridge_cfgwrite

This is in preparation for removal of the partition modes vdev ops, and call them
directly instead.

Tracked-On: #2534
Signed-off-by: dongshen <dongsheng.x.zhang@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
dongshen 2019-03-06 14:03:27 -08:00 committed by wenlingz
parent 93f6142d14
commit 82789f44a9
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,7 @@
#include <pci.h>
#include "pci_priv.h"
static int32_t vdev_hostbridge_init(struct pci_vdev *vdev)
int32_t vdev_hostbridge_init(struct pci_vdev *vdev)
{
/* PCI config space */
pci_vdev_write_cfg_u16(vdev, PCIR_VENDOR, (uint16_t)0x8086U);
@ -86,12 +86,12 @@ static int32_t vdev_hostbridge_init(struct pci_vdev *vdev)
return 0;
}
static int32_t vdev_hostbridge_deinit(__unused struct pci_vdev *vdev)
int32_t vdev_hostbridge_deinit(__unused struct pci_vdev *vdev)
{
return 0;
}
static int32_t vdev_hostbridge_cfgread(const struct pci_vdev *vdev, uint32_t offset,
int32_t vdev_hostbridge_cfgread(const struct pci_vdev *vdev, uint32_t offset,
uint32_t bytes, uint32_t *val)
{
/* Assumption: access needed to be aligned on 1/2/4 bytes */
@ -105,7 +105,7 @@ static int32_t vdev_hostbridge_cfgread(const struct pci_vdev *vdev, uint32_t off
return 0;
}
static int32_t vdev_hostbridge_cfgwrite(struct pci_vdev *vdev, uint32_t offset,
int32_t vdev_hostbridge_cfgwrite(struct pci_vdev *vdev, uint32_t offset,
uint32_t bytes, uint32_t val)
{
/* Assumption: access needed to be aligned on 1/2/4 bytes */

10
hypervisor/dm/vpci/pci_priv.h
View File

@ -69,6 +69,16 @@ static inline void pci_vdev_write_cfg_u32(struct pci_vdev *vdev, uint32_t offset
#ifdef CONFIG_PARTITION_MODE
extern const struct vpci_ops partition_mode_vpci_ops;
int32_t vdev_hostbridge_init(struct pci_vdev *vdev);
int32_t vdev_hostbridge_cfgread(const struct pci_vdev *vdev, uint32_t offset, uint32_t bytes, uint32_t *val);
int32_t vdev_hostbridge_cfgwrite(struct pci_vdev *vdev, uint32_t offset, uint32_t bytes, uint32_t val);
int32_t vdev_hostbridge_deinit(__unused struct pci_vdev *vdev);
int32_t vdev_pt_init(struct pci_vdev *vdev);
int32_t vdev_pt_cfgread(const struct pci_vdev *vdev, uint32_t offset, uint32_t bytes, uint32_t *val);
int32_t vdev_pt_cfgwrite(struct pci_vdev *vdev, uint32_t offset, uint32_t bytes, uint32_t val);
int32_t vdev_pt_deinit(struct pci_vdev *vdev);
#else
extern const struct vpci_ops sharing_mode_vpci_ops;
extern const struct pci_vdev_ops pci_ops_vdev_msi;

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

@ -58,7 +58,7 @@ static int32_t vdev_pt_init_validate(struct pci_vdev *vdev)
return 0;
}
static int32_t vdev_pt_init(struct pci_vdev *vdev)
int32_t vdev_pt_init(struct pci_vdev *vdev)
{
int32_t ret;
struct acrn_vm *vm = vdev->vpci->vm;
@ -91,7 +91,7 @@ static int32_t vdev_pt_init(struct pci_vdev *vdev)
return ret;
}
static int32_t vdev_pt_deinit(struct pci_vdev *vdev)
int32_t vdev_pt_deinit(struct pci_vdev *vdev)
{
int32_t ret;
struct acrn_vm *vm = vdev->vpci->vm;
@ -102,7 +102,7 @@ static int32_t vdev_pt_deinit(struct pci_vdev *vdev)
return ret;
}
static int32_t vdev_pt_cfgread(const struct pci_vdev *vdev, uint32_t offset,
int32_t vdev_pt_cfgread(const struct pci_vdev *vdev, uint32_t offset,
uint32_t bytes, uint32_t *val)
{
/* Assumption: access needed to be aligned on 1/2/4 bytes */
@ -181,7 +181,7 @@ static void vdev_pt_cfgwrite_bar(struct pci_vdev *vdev, uint32_t offset,
pci_vdev_write_cfg_u32(vdev, offset, new_bar);
}
static int32_t vdev_pt_cfgwrite(struct pci_vdev *vdev, uint32_t offset,
int32_t vdev_pt_cfgwrite(struct pci_vdev *vdev, uint32_t offset,
uint32_t bytes, uint32_t val)
{
/* Assumption: access needed to be aligned on 1/2/4 bytes */