d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get rid of redundant 'table_size' field in struct pi_msix. If needed it can

Browse Source 
always be calculated from the number of entries in the MSI-X table.

Obtained from:	NetApp
This commit is contained in:
Neel Natu 2013-01-21 08:12:59 +00:00
parent f74d878fda
commit c3cbaac942
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
usr.sbin/bhyve/pci_emul.h
View File

@ -119,7 +119,6 @@ struct pci_devinst {
int table_bar; int table_bar;
int pba_bar; int pba_bar;
size_t table_offset; size_t table_offset;
size_t table_size;
int table_count; int table_count;
size_t pba_offset; size_t pba_offset;
struct msix_table_entry table[MAX_MSIX_TABLE_SIZE]; struct msix_table_entry table[MAX_MSIX_TABLE_SIZE];

3
usr.sbin/bhyve/pci_passthru.c
View File

@ -362,11 +362,10 @@ init_msix_table(struct vmctx *ctx, struct passthru_softc *sc, uint64_t base)
* XXX for now, assume that the table is not in the middle * XXX for now, assume that the table is not in the middle
*/ */
table_size = pi->pi_msix.table_count * MSIX_TABLE_ENTRY_SIZE; table_size = pi->pi_msix.table_count * MSIX_TABLE_ENTRY_SIZE;
pi->pi_msix.table_size = table_size;
idx = pi->pi_msix.table_bar; idx = pi->pi_msix.table_bar;
/* Round up to page size */ /* Round up to page size */
table_size = (table_size + 0x1000) & ~0xFFF; table_size = roundup2(table_size, 4096);
if (pi->pi_msix.table_offset == 0) { if (pi->pi_msix.table_offset == 0) {
/* Map everything after the MSI-X table */ /* Map everything after the MSI-X table */
start = pi->pi_bar[idx].addr + table_size; start = pi->pi_bar[idx].addr + table_size;