github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-18 11:47:30 +00:00
Code Issues Projects Releases Wiki Activity

HV: call function is_prelaunched_vm() instead to reduce code

Browse Source 
And make related changes accordingly:
 Remove calling of get_vm_config()
 Remove local variables vm and acrn_vm_config

Tracked-On: #3022
Signed-off-by: dongshen <dongsheng.x.zhang@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
dongshen 2019-05-21 15:29:56 -07:00 committed by ACRN System Integration
parent a6503c6af3
commit d0fe18209c
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,14 +74,9 @@ void vdev_pt_remap_msix_table_bar(struct pci_vdev *vdev)
struct pci_msix *msix = &vdev->msix; struct pci_msix *msix = &vdev->msix;
struct pci_pdev *pdev = vdev->pdev; struct pci_pdev *pdev = vdev->pdev;
struct pci_bar *bar; struct pci_bar *bar;
struct acrn_vm *vm = vdev->vpci->vm;
struct acrn_vm_config *vm_config;
vm_config = get_vm_config(vm->vm_id);
ASSERT(vdev->pdev->msix.table_bar < (PCI_BAR_COUNT - 1U), "msix->table_bar is out of range"); ASSERT(vdev->pdev->msix.table_bar < (PCI_BAR_COUNT - 1U), "msix->table_bar is out of range");
/* Mask all table entries */ /* Mask all table entries */
for (i = 0U; i < msix->table_count; i++) { for (i = 0U; i < msix->table_count; i++) {
msix->tables[i].vector_control = PCIM_MSIX_VCTRL_MASK; msix->tables[i].vector_control = PCIM_MSIX_VCTRL_MASK;
@ -92,7 +87,7 @@ void vdev_pt_remap_msix_table_bar(struct pci_vdev *vdev)
bar = &pdev->bar[msix->table_bar]; bar = &pdev->bar[msix->table_bar];
if (bar != NULL) { if (bar != NULL) {
msix->mmio_hpa = bar->base; msix->mmio_hpa = bar->base;
if (vm_config->load_order == PRE_LAUNCHED_VM) { if (is_prelaunched_vm(vdev->vpci->vm)) {
msix->mmio_gpa = vdev->bar[msix->table_bar].base; msix->mmio_gpa = vdev->bar[msix->table_bar].base;
} else { } else {
msix->mmio_gpa = sos_vm_hpa2gpa(bar->base); msix->mmio_gpa = sos_vm_hpa2gpa(bar->base);
@ -100,7 +95,6 @@ void vdev_pt_remap_msix_table_bar(struct pci_vdev *vdev)
msix->mmio_size = bar->size; msix->mmio_size = bar->size;
} }
/* /*
* For SOS: * For SOS:
* -------- * --------
@ -143,7 +137,7 @@ void vdev_pt_remap_msix_table_bar(struct pci_vdev *vdev)
if (msix->mmio_gpa != 0UL) { if (msix->mmio_gpa != 0UL) {
if (vm_config->load_order == PRE_LAUNCHED_VM) { if (is_prelaunched_vm(vdev->vpci->vm)) {
addr_hi = msix->mmio_gpa + msix->mmio_size; addr_hi = msix->mmio_gpa + msix->mmio_size;
addr_lo = msix->mmio_gpa; addr_lo = msix->mmio_gpa;
} else { } else {