[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 1/7] vmxnet3: Change offsets of msi/msix pci capa
From: |
Shmulik Ladkani |
Subject: |
[Qemu-devel] [PATCH v4 1/7] vmxnet3: Change offsets of msi/msix pci capabilities |
Date: |
Thu, 24 Dec 2015 09:17:35 +0200 |
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>
---
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 37373e5..d323895 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 */
@@ -2102,7 +2115,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);
@@ -2130,7 +2143,6 @@ vmxnet3_cleanup_msix(VMXNET3State *s)
}
}
-#define VMXNET3_MSI_OFFSET (0x50)
#define VMXNET3_USE_64BIT (true)
#define VMXNET3_PER_VECTOR_MASK (false)
@@ -2140,7 +2152,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);
--
1.9.1
- [Qemu-devel] [PATCH v4 0/7] vmxnet3: Fine-tune device capabilities, Shmulik Ladkani, 2015/12/24
- [Qemu-devel] [PATCH v4 1/7] vmxnet3: Change offsets of msi/msix pci capabilities,
Shmulik Ladkani <=
- [Qemu-devel] [PATCH v4 2/7] vmxnet3: Change the offset of the MSIX PBA table, Shmulik Ladkani, 2015/12/24
- [Qemu-devel] [PATCH v4 3/7] vmxnet3: Introduce 'x-old-msi-offsets' back-compat property, Shmulik Ladkani, 2015/12/24
- [Qemu-devel] [PATCH v4 4/7] vmxnet3: coding: Introduce VMXNET3Class, Shmulik Ladkani, 2015/12/24
- [Qemu-devel] [PATCH v4 5/7] vmxnet3: The vmxnet3 device is a PCIE endpoint, Shmulik Ladkani, 2015/12/24
- [Qemu-devel] [PATCH v4 6/7] vmxnet3: Introduce 'x-disable-pcie' back-compat property, Shmulik Ladkani, 2015/12/24
- [Qemu-devel] [PATCH v4 7/7] vmxnet3: Report the Device Serial Number capability, Shmulik Ladkani, 2015/12/24
- Re: [Qemu-devel] [PATCH v4 0/7] vmxnet3: Fine-tune device capabilities, Jason Wang, 2015/12/27