github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2026-01-05 23:57:10 +00:00
Code Issues Projects Releases Wiki Activity

HV: VPCI coding style fix

Browse Source 
- Converted MACROS to functions
- Defined pci_bar_type enum
- Defined pci_bdf as union instead of uint16_t to eliminate macros
- Use L or UL postfix after unsigned integers

Tracked-On: #1126
Signed-off-by: dongshen <dongsheng.x.zhang@intel.com>
This commit is contained in:
dongshen
2018-08-28 11:39:32 -07:00
committed by lijinxia
parent 54439ecae1
commit c9ea8901e6
7 changed files with 140 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
hypervisor/partition/vm_description.c
View File

@@ -33,42 +33,44 @@ static struct vpci_vdev_array vpci_vdev_array1 = {
.vpci_vdev_list = {
{/*vdev 0: hostbridge */
.vbdf = PCI_BDF(0x00U, 0x00U, 0x00U),
.vbdf.bits = {.b = 0x00U, .d = 0x00U, .f = 0x0U},
.ops = &pci_ops_vdev_hostbridge,
.bar = {}, /* don't care for hostbridge */
.pdev = {} /* don't care for hostbridge */
.bar = {},
.pdev = {
.bdf.bits = {.b = 0x00U, .d = 0x00U, .f = 0x0U},
}
},
{/*vdev 1*/
.vbdf = PCI_BDF(0x00U, 0x01U, 0x00U),
.vbdf.bits = {.b = 0x00U, .d = 0x01U, .f = 0x0U},
.ops = &pci_ops_vdev_pt,
.bar = {
[0] = {
.base = 0UL,
.size = ALIGN_UP_4K(0x100UL),
.type = PCIM_BAR_MEM_32
.size = 0x1000UL,
.type = PCIBAR_MEM32
},
[5] = {
.base = 0UL,
.size = ALIGN_UP_4K(0x2000UL),
.type = PCIM_BAR_MEM_32
.size = 0x2000UL,
.type = PCIBAR_MEM32
},
},
.pdev = {
.bdf = PCI_BDF(0x00U, 0x01U, 0x00U),
.pdev = {
.bdf.bits = {.b = 0x00U, .d = 0x01U, .f = 0x0U},
.bar = {
[0] = {
.base = 0xa9000000UL,
.size = 0x100UL,
.type = PCIM_BAR_MEM_32
.type = PCIBAR_MEM32
},
[5] = {
.base = 0x1a0000000UL,
.size = 0x2000UL,
.type = PCIM_BAR_MEM_64
.type = PCIBAR_MEM64
},
}
}
}
},
}
};
@@ -78,42 +80,42 @@ static struct vpci_vdev_array vpci_vdev_array2 = {
.vpci_vdev_list = {
{/*vdev 0: hostbridge*/
.vbdf = PCI_BDF(0x00U, 0x00U, 0x00U),
.vbdf.bits = {.b = 0x00U, .d = 0x00U, .f = 0x0U},
.ops = &pci_ops_vdev_hostbridge,
.bar = {}, /* don't care for hostbridge */
.pdev = {} /* don't care for hostbridge */
},
{/*vdev 1*/
.vbdf = PCI_BDF(0x00U, 0x01U, 0x00U),
.vbdf.bits = {.b = 0x00U, .d = 0x01U, .f = 0x0U},
.ops = &pci_ops_vdev_pt,
.bar = {
[0] = {
.base = 0UL,
.size = ALIGN_UP_4K(0x100UL),
.type = PCIM_BAR_MEM_32
.size = 0x1000UL,
.type = PCIBAR_MEM32
},
[5] = {
.base = 0UL,
.size = ALIGN_UP_4K(0x2000UL),
.type = PCIM_BAR_MEM_32
.size = 0x2000UL,
.type = PCIBAR_MEM32
},
},
.pdev = {
.bdf = PCI_BDF(0x00U, 0x02U, 0x00U),
},
.pdev = {
.bdf.bits = {.b = 0x00U, .d = 0x02U, .f = 0x0U},
.bar = {
[0] = {
.base = 0xa8000000UL,
.size = 0x100UL,
.type = PCIM_BAR_MEM_32
.type = PCIBAR_MEM32
},
[5] = {
.base = 0x1b0000000UL,
.size = 0x2000UL,
.type = PCIM_BAR_MEM_64
.type = PCIBAR_MEM64
},
}
}
}
},
}
};