github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-20 12:42:54 +00:00
Code Issues Projects Releases Wiki Activity

HV: remove ptdev ops init in vm description

Browse Source 
The ptdev ops will be initialized automatically during ptdev init, so
remove the hardcoded ops in vm_description.c

Tracked-On: #2431
Signed-off-by: Victor Sun <victor.sun@intel.com>
Signed-off-by: dongshen <dongsheng.x.zhang@intel.com>
Reviewed-by: Anthony Xu <anthony.xu@intel.com>
This commit is contained in:
Victor Sun 2019-01-18 01:34:26 +08:00 committed by ACRN System Integration
parent 69d883560a
commit 6ba07e64b9
3 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -107,12 +107,14 @@ static int32_t partition_mode_vpci_init(const struct acrn_vm *vm)
vdev = &vdev_array->vpci_vdev_list[i];
vdev->vpci = vpci;
/* Exclude hostbridge */
if (vdev->vbdf.value != 0U) {
partition_mode_pdev_init(vdev);
vdev->ops = &pci_ops_vdev_pt;
} else {
vdev->ops = &pci_ops_vdev_hostbridge;
}
if ((vdev->ops != NULL) && (vdev->ops->init != NULL)) {
if (vdev->ops->init != NULL) {
if (vdev->ops->init(vdev) != 0) {
pr_err("%s() failed at PCI device (bdf %x)!", __func__,
vdev->vbdf);

5
hypervisor/partition/apl-mrb/vm_description.c
View File

@ -13,7 +13,6 @@ static struct vpci_vdev_array vpci_vdev_array1 = {
.vpci_vdev_list = {
{/*vdev 0: hostbridge */
.vbdf.bits = {.b = 0x00U, .d = 0x00U, .f = 0x0U},
.ops = &pci_ops_vdev_hostbridge,
.pdev = {
.bdf.bits = {.b = 0x00U, .d = 0x00U, .f = 0x0U},
}
@ -21,7 +20,6 @@ static struct vpci_vdev_array vpci_vdev_array1 = {
{/*vdev 1: SATA controller*/
.vbdf.bits = {.b = 0x00U, .d = 0x01U, .f = 0x0U},
.ops = &pci_ops_vdev_pt,
.pdev = {
.bdf.bits = {.b = 0x00U, .d = 0x12U, .f = 0x0U},
}
@ -35,7 +33,6 @@ static struct vpci_vdev_array vpci_vdev_array2 = {
.vpci_vdev_list = {
{/*vdev 0: hostbridge*/
.vbdf.bits = {.b = 0x00U, .d = 0x00U, .f = 0x0U},
.ops = &pci_ops_vdev_hostbridge,
.pdev = {
.bdf.bits = {.b = 0x00U, .d = 0x00U, .f = 0x0U},
}
@ -43,7 +40,6 @@ static struct vpci_vdev_array vpci_vdev_array2 = {
{/*vdev 1: USB controller*/
.vbdf.bits = {.b = 0x00U, .d = 0x01U, .f = 0x0U},
.ops = &pci_ops_vdev_pt,
.pdev = {
.bdf.bits = {.b = 0x00U, .d = 0x15U, .f = 0x0U},
}
@ -51,7 +47,6 @@ static struct vpci_vdev_array vpci_vdev_array2 = {
{/*vdev 2: Ethernet*/
.vbdf.bits = {.b = 0x00U, .d = 0x02U, .f = 0x0U},
.ops = &pci_ops_vdev_pt,
.pdev = {
.bdf.bits = {.b = 0x02U, .d = 0x00U, .f = 0x0U},
}

6
hypervisor/partition/dnv-cb2/vm_description.c
View File

@ -12,7 +12,6 @@ static struct vpci_vdev_array vpci_vdev_array1 = {
.vpci_vdev_list = {
{/*vdev 0: hostbridge */
.vbdf.bits = {.b = 0x00U, .d = 0x00U, .f = 0x0U},
.ops = &pci_ops_vdev_hostbridge,
.pdev = {
.bdf.bits = {.b = 0x00U, .d = 0x00U, .f = 0x0U},
}
@ -20,7 +19,6 @@ static struct vpci_vdev_array vpci_vdev_array1 = {
{/*vdev 1: Ethernet*/
.vbdf.bits = {.b = 0x00U, .d = 0x01U, .f = 0x0U},
.ops = &pci_ops_vdev_pt,
.pdev = {
.bdf.bits = {.b = 0x03U, .d = 0x00U, .f = 0x1U},
}
@ -28,7 +26,6 @@ static struct vpci_vdev_array vpci_vdev_array1 = {
{/*vdev 2: USB*/
.vbdf.bits = {.b = 0x00U, .d = 0x02U, .f = 0x0U},
.ops = &pci_ops_vdev_pt,
.pdev = {
.bdf.bits = {.b = 0x00U, .d = 0x15U, .f = 0x0U},
@ -43,7 +40,6 @@ static struct vpci_vdev_array vpci_vdev_array2 = {
.vpci_vdev_list = {
{/*vdev 0: hostbridge*/
.vbdf.bits = {.b = 0x00U, .d = 0x00U, .f = 0x0U},
.ops = &pci_ops_vdev_hostbridge,
.pdev = {
.bdf.bits = {.b = 0x00U, .d = 0x00U, .f = 0x0U},
}
@ -51,7 +47,6 @@ static struct vpci_vdev_array vpci_vdev_array2 = {
{/*vdev 1: SATA controller*/
.vbdf.bits = {.b = 0x00U, .d = 0x05U, .f = 0x0U},
.ops = &pci_ops_vdev_pt,
.pdev = {
.bdf.bits = {.b = 0x00U, .d = 0x14U, .f = 0x0U},
}
@ -59,7 +54,6 @@ static struct vpci_vdev_array vpci_vdev_array2 = {
{/*vdev 2: Ethernet*/
.vbdf.bits = {.b = 0x00U, .d = 0x06U, .f = 0x0U},
.ops = &pci_ops_vdev_pt,
.pdev = {
.bdf.bits = {.b = 0x03U, .d = 0x00U, .f = 0x0U},