Index: cap.c
===================================================================
--- cap.c	(revision 246087)
+++ cap.c	(working copy)
@@ -449,22 +449,30 @@
 static void
 cap_msix(int fd, struct pci_conf *p, uint8_t ptr)
 {
-	uint32_t val;
+	uint32_t val, table_offset, pba_offset;
 	uint16_t ctrl;
 	int msgnum, table_bar, pba_bar;
 
 	ctrl = read_config(fd, &p->pc_sel, ptr + PCIR_MSIX_CTRL, 2);
 	msgnum = (ctrl & PCIM_MSIXCTRL_TABLE_SIZE) + 1;
+
 	val = read_config(fd, &p->pc_sel, ptr + PCIR_MSIX_TABLE, 4);
 	table_bar = PCIR_BAR(val & PCIM_MSIX_BIR_MASK);
+	table_offset = val & ~PCIM_MSIX_BIR_MASK;
+
 	val = read_config(fd, &p->pc_sel, ptr + PCIR_MSIX_PBA, 4);
-	pba_bar = PCIR_BAR(val & PCIM_MSIX_BIR_MASK);	
+	pba_bar = PCIR_BAR(val & PCIM_MSIX_BIR_MASK);
+	pba_offset = val & ~PCIM_MSIX_BIR_MASK;
+
 	printf("MSI-X supports %d message%s ", msgnum,
 	    (msgnum == 1) ? "" : "s");
-	if (table_bar == pba_bar)
-		printf("in map 0x%x", table_bar);
-	else
-		printf("in maps 0x%x and 0x%x", table_bar, pba_bar);
+	if (table_bar == pba_bar) {
+		printf("in map 0x%x[0x%x][0x%x]",
+			table_bar, table_offset, pba_offset);
+	} else {
+		printf("in maps 0x%x[0x%x] and 0x%x[0x%x]",
+			table_bar, table_offset, pba_bar, pba_offset);
+	}
 	if (ctrl & PCIM_MSIXCTRL_MSIX_ENABLE)
 		printf(" enabled");
 }