[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 14/24] vmxnet3: Change offsets of msi/msix pci capabi
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL 14/24] vmxnet3: Change offsets of msi/msix pci capabilities |
Date: |
Mon, 11 Jan 2016 13:31:05 +0800 |
From: Shmulik Ladkani <address@hidden>
Place device reported PCI capabilities at the same offsets as placed by
the VMware virtual hardware: MSI at [84], MSI-X at [9c].
Signed-off-by: Shmulik Ladkani <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
hw/net/vmxnet3.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c
index 63692c5..0097f4b 100644
--- a/hw/net/vmxnet3.c
+++ b/hw/net/vmxnet3.c
@@ -36,6 +36,16 @@
#define VMXNET3_MSIX_BAR_SIZE 0x2000
#define MIN_BUF_SIZE 60
+/* Compatability flags for migration */
+#define VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS_BIT 0
+#define VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS \
+ (1 << VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS_BIT)
+
+#define VMXNET3_MSI_OFFSET(s) \
+ ((s)->compat_flags & VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS ? 0x50 : 0x84)
+#define VMXNET3_MSIX_OFFSET(s) \
+ ((s)->compat_flags & VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS ? 0 : 0x9c)
+
#define VMXNET3_BAR0_IDX (0)
#define VMXNET3_BAR1_IDX (1)
#define VMXNET3_MSIX_BAR_IDX (2)
@@ -313,6 +323,9 @@ typedef struct {
MACAddr *mcast_list;
uint32_t mcast_list_len;
uint32_t mcast_list_buff_size; /* needed for live migration. */
+
+ /* Compatability flags for migration */
+ uint32_t compat_flags;
} VMXNET3State;
/* Interrupt management */
@@ -2131,7 +2144,7 @@ vmxnet3_init_msix(VMXNET3State *s)
VMXNET3_MSIX_BAR_IDX, VMXNET3_OFF_MSIX_TABLE,
&s->msix_bar,
VMXNET3_MSIX_BAR_IDX, VMXNET3_OFF_MSIX_PBA,
- 0);
+ VMXNET3_MSIX_OFFSET(s));
if (0 > res) {
VMW_WRPRN("Failed to initialize MSI-X, error %d", res);
@@ -2159,7 +2172,6 @@ vmxnet3_cleanup_msix(VMXNET3State *s)
}
}
-#define VMXNET3_MSI_OFFSET (0x50)
#define VMXNET3_USE_64BIT (true)
#define VMXNET3_PER_VECTOR_MASK (false)
@@ -2169,7 +2181,7 @@ vmxnet3_init_msi(VMXNET3State *s)
PCIDevice *d = PCI_DEVICE(s);
int res;
- res = msi_init(d, VMXNET3_MSI_OFFSET, VMXNET3_MAX_NMSIX_INTRS,
+ res = msi_init(d, VMXNET3_MSI_OFFSET(s), VMXNET3_MAX_NMSIX_INTRS,
VMXNET3_USE_64BIT, VMXNET3_PER_VECTOR_MASK);
if (0 > res) {
VMW_WRPRN("Failed to initialize MSI, error %d", res);
--
2.5.0
- [Qemu-devel] [PULL 04/24] net/vmxnet3: remove redundant VMW_SHPRN(...) definition, (continued)
- [Qemu-devel] [PULL 04/24] net/vmxnet3: remove redundant VMW_SHPRN(...) definition, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 05/24] net: vmxnet3: avoid memory leakage in activate_device, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 06/24] MAINTAINERS: Add an entry for the net/slirp.c file, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 07/24] net/vmxnet3: return 1 on device activation failure, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 08/24] net/vmxnet3: return correct value for VMXNET3_CMD_GET_DID_* command, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 09/24] net/vmxnet3: return correct value for VMXNET3_CMD_GET_DEV_EXTRA_INFO, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 10/24] net/vmxnet3: return 0 on unknown command, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 11/24] net/vmxnet3: rename VMXNET3_DEVICE_VERSION to VMXNET3_UPT_REVISION, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 12/24] net/dump: fix nfds->filename leak, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 13/24] net/filter: fix nf->netdev_id leak, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 14/24] vmxnet3: Change offsets of msi/msix pci capabilities,
Jason Wang <=
- [Qemu-devel] [PULL 15/24] vmxnet3: Change the offset of the MSIX PBA table, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 16/24] vmxnet3: Introduce 'x-old-msi-offsets' back-compat property, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 17/24] vmxnet3: coding: Introduce VMXNET3Class, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 18/24] vmxnet3: The vmxnet3 device is a PCIE endpoint, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 19/24] vmxnet3: Report the Device Serial Number capability, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 20/24] vmxnet3: Introduce 'x-disable-pcie' back-compat property, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 21/24] net: rocker: fix an incorrect array bounds check, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 23/24] l2tpv3: fix cookie decoding, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 22/24] net: ne2000: fix bounds check in ioport operations, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 24/24] ether/slirp: Avoid redefinition of the same constants, Jason Wang, 2016/01/11