Skip to content

Commit f7f2a6e

Browse files
Sainath Grandhiacrnsi
authored andcommitted
hv: Rename tables member of vPCI msix struct pci_msix
Rename MSI-X struct, pci_msix, member from tables to table_entries Tracked-On: #3265 Signed-off-by: Sainath Grandhi <sainath.grandhi@intel.com> Acked-by: Eddie Dong <eddie.dong@intel.com>
1 parent 22f24c2 commit f7f2a6e

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

hypervisor/dm/vpci/pci_pt.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ void vdev_pt_remap_msix_table_bar(struct pci_vdev *vdev)
7979

8080
/* Mask all table entries */
8181
for (i = 0U; i < msix->table_count; i++) {
82-
msix->tables[i].vector_control = PCIM_MSIX_VCTRL_MASK;
83-
msix->tables[i].addr = 0U;
84-
msix->tables[i].data = 0U;
82+
msix->table_entries[i].vector_control = PCIM_MSIX_VCTRL_MASK;
83+
msix->table_entries[i].addr = 0U;
84+
msix->table_entries[i].data = 0U;
8585
}
8686

8787
bar = &pdev->bar[msix->table_bar];

hypervisor/dm/vpci/vmsix.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ static int32_t vmsix_remap_entry(const struct pci_vdev *vdev, uint32_t index, bo
7474
void *hva;
7575
int32_t ret;
7676

77-
info.vmsi_addr.full = vdev->msix.tables[index].addr;
78-
info.vmsi_data.full = (enable) ? vdev->msix.tables[index].data : 0U;
77+
info.vmsi_addr.full = vdev->msix.table_entries[index].addr;
78+
info.vmsi_data.full = (enable) ? vdev->msix.table_entries[index].data : 0U;
7979

8080
ret = ptirq_msix_remap(vdev->vpci->vm, vdev->vbdf.value, vdev->pdev->bdf.value, (uint16_t)index, &info);
8181
if (ret == 0) {
@@ -93,7 +93,7 @@ static int32_t vmsix_remap_entry(const struct pci_vdev *vdev, uint32_t index, bo
9393
mmio_write32((uint32_t)(info.pmsi_addr.full >> 32U), (void *)((char *)&(pentry->addr) + 4U));
9494

9595
mmio_write32(info.pmsi_data.full, (void *)&(pentry->data));
96-
mmio_write32(vdev->msix.tables[index].vector_control, (void *)&(pentry->vector_control));
96+
mmio_write32(vdev->msix.table_entries[index].vector_control, (void *)&(pentry->vector_control));
9797
clac();
9898
}
9999

@@ -246,7 +246,7 @@ static void vmsix_table_rw(const struct pci_vdev *vdev, struct mmio_request *mmi
246246
index = table_offset / MSIX_TABLE_ENTRY_SIZE;
247247

248248
if (index < vdev->msix.table_count) {
249-
entry = &vdev->msix.tables[index];
249+
entry = &vdev->msix.table_entries[index];
250250
entry_offset = table_offset % MSIX_TABLE_ENTRY_SIZE;
251251

252252
if (mmio->direction == REQUEST_READ) {

hypervisor/include/dm/vpci.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ struct pci_msi {
4747

4848
/* MSI-X capability structure */
4949
struct pci_msix {
50-
struct msix_table_entry tables[CONFIG_MAX_MSIX_TABLE_NUM];
50+
struct msix_table_entry table_entries[CONFIG_MAX_MSIX_TABLE_NUM];
5151
uint64_t mmio_gpa;
5252
uint64_t mmio_hpa;
5353
uint64_t mmio_size;

0 commit comments

Comments
 (0)