From aa1ee9424c7f5be706e7aadc4eff4ceb69a5b32b Mon Sep 17 00:00:00 2001 From: dongshen Date: Wed, 6 Mar 2019 15:08:14 -0800 Subject: [PATCH] HV: declare and export vpci ops functions as global instead of static local In preparation for vpci ops function removal, so that these functions can be called directly instead by vpci code Tracked-On: #2534 Signed-off-by: dongshen Acked-by: Eddie Dong --- hypervisor/dm/vpci/partition_mode.c | 8 ++++---- hypervisor/dm/vpci/sharing_mode.c | 8 ++++---- hypervisor/include/dm/vpci.h | 14 ++++++++++++++ 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/hypervisor/dm/vpci/partition_mode.c b/hypervisor/dm/vpci/partition_mode.c index debc5f842..6b9f1aae2 100644 --- a/hypervisor/dm/vpci/partition_mode.c +++ b/hypervisor/dm/vpci/partition_mode.c @@ -91,7 +91,7 @@ static void partition_mode_pdev_init(struct pci_vdev *vdev, union pci_bdf pbdf) * @pre vm != NULL * @pre vm->vpci.pci_vdev_cnt <= CONFIG_MAX_PCI_DEV_NUM */ -static int32_t partition_mode_vpci_init(const struct acrn_vm *vm) +int32_t partition_mode_vpci_init(const struct acrn_vm *vm) { struct acrn_vpci *vpci = (struct acrn_vpci *)&(vm->vpci); struct pci_vdev *vdev; @@ -121,7 +121,7 @@ static int32_t partition_mode_vpci_init(const struct acrn_vm *vm) * @pre vm != NULL * @pre vm->vpci.pci_vdev_cnt <= CONFIG_MAX_PCI_DEV_NUM */ -static void partition_mode_vpci_deinit(const struct acrn_vm *vm) +void partition_mode_vpci_deinit(const struct acrn_vm *vm) { struct pci_vdev *vdev; uint32_t i; @@ -137,7 +137,7 @@ static void partition_mode_vpci_deinit(const struct acrn_vm *vm) } } -static void partition_mode_cfgread(struct acrn_vpci *vpci, union pci_bdf vbdf, +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 = pci_find_vdev_by_vbdf(vpci, vbdf); @@ -155,7 +155,7 @@ static void partition_mode_cfgread(struct acrn_vpci *vpci, union pci_bdf vbdf, } } -static void partition_mode_cfgwrite(struct acrn_vpci *vpci, union pci_bdf vbdf, +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 = pci_find_vdev_by_vbdf(vpci, vbdf); diff --git a/hypervisor/dm/vpci/sharing_mode.c b/hypervisor/dm/vpci/sharing_mode.c index 5e35bb288..4e8b99c99 100644 --- a/hypervisor/dm/vpci/sharing_mode.c +++ b/hypervisor/dm/vpci/sharing_mode.c @@ -42,7 +42,7 @@ static struct pci_vdev *sharing_mode_find_vdev_sos(union pci_bdf pbdf) return pci_find_vdev_by_pbdf(&vm->vpci, pbdf); } -static void sharing_mode_cfgread(__unused struct acrn_vpci *vpci, union pci_bdf bdf, +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; @@ -62,7 +62,7 @@ static void sharing_mode_cfgread(__unused struct acrn_vpci *vpci, union pci_bdf } } -static void sharing_mode_cfgwrite(__unused struct acrn_vpci *vpci, union pci_bdf bdf, +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; @@ -105,7 +105,7 @@ static void init_vdev_for_pdev(struct pci_pdev *pdev, const void *vm) } } -static int32_t sharing_mode_vpci_init(const struct acrn_vm *vm) +int32_t sharing_mode_vpci_init(const struct acrn_vm *vm) { int32_t ret = -ENODEV; @@ -126,7 +126,7 @@ static int32_t sharing_mode_vpci_init(const struct acrn_vm *vm) * @pre vm != NULL * @pre vm->vpci.pci_vdev_cnt <= CONFIG_MAX_PCI_DEV_NUM */ -static void sharing_mode_vpci_deinit(const struct acrn_vm *vm) +void sharing_mode_vpci_deinit(const struct acrn_vm *vm) { struct pci_vdev *vdev; uint32_t i; diff --git a/hypervisor/include/dm/vpci.h b/hypervisor/include/dm/vpci.h index 20f3d7001..e68e86b56 100644 --- a/hypervisor/include/dm/vpci.h +++ b/hypervisor/include/dm/vpci.h @@ -105,6 +105,20 @@ struct acrn_vpci { struct pci_vdev pci_vdevs[CONFIG_MAX_PCI_DEV_NUM]; }; +int32_t partition_mode_vpci_init(const struct acrn_vm *vm); +void partition_mode_cfgread(struct acrn_vpci *vpci, union pci_bdf vbdf, + uint32_t offset, uint32_t bytes, uint32_t *val); +void partition_mode_cfgwrite(struct acrn_vpci *vpci, union pci_bdf vbdf, + uint32_t offset, uint32_t bytes, uint32_t val); +void partition_mode_vpci_deinit(const struct acrn_vm *vm); + +int32_t sharing_mode_vpci_init(const struct acrn_vm *vm); +void sharing_mode_cfgread(struct acrn_vpci *vpci, union pci_bdf bdf, + uint32_t offset, uint32_t bytes, uint32_t *val); +void sharing_mode_cfgwrite(__unused struct acrn_vpci *vpci, union pci_bdf bdf, + uint32_t offset, uint32_t bytes, uint32_t val); +void sharing_mode_vpci_deinit(const struct acrn_vm *vm); + void vpci_init(struct acrn_vm *vm); void vpci_cleanup(const struct acrn_vm *vm); void vpci_set_ptdev_intr_info(const struct acrn_vm *target_vm, uint16_t vbdf, uint16_t pbdf);