[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 19/24] vmxnet3: Report the Device Serial Number capab
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL 19/24] vmxnet3: Report the Device Serial Number capability |
Date: |
Mon, 11 Jan 2016 13:31:10 +0800 |
From: Shmulik Ladkani <address@hidden>
Report the DSN extended PCI capability at 0x100.
DSN value is a transformation of device MAC address, as calculated
by VMware virtual hardware.
DSN is reported only if device is pcie.
Signed-off-by: Shmulik Ladkani <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
hw/net/vmxnet3.c | 28 ++++++++++++++++++++++++++--
1 file changed, 26 insertions(+), 2 deletions(-)
diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c
index 4dc7519..aee218c 100644
--- a/hw/net/vmxnet3.c
+++ b/hw/net/vmxnet3.c
@@ -49,6 +49,7 @@
((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_DSN_OFFSET (0x100)
#define VMXNET3_BAR0_IDX (0)
#define VMXNET3_BAR1_IDX (1)
@@ -2253,6 +2254,22 @@ static const MemoryRegionOps b1_ops = {
},
};
+static uint8_t *vmxnet3_device_serial_num(VMXNET3State *s)
+{
+ static uint64_t dsn_payload;
+ uint8_t *dsnp = (uint8_t *)&dsn_payload;
+
+ dsnp[0] = 0xfe;
+ dsnp[1] = s->conf.macaddr.a[3];
+ dsnp[2] = s->conf.macaddr.a[4];
+ dsnp[3] = s->conf.macaddr.a[5];
+ dsnp[4] = s->conf.macaddr.a[0];
+ dsnp[5] = s->conf.macaddr.a[1];
+ dsnp[6] = s->conf.macaddr.a[2];
+ dsnp[7] = 0xff;
+ return dsnp;
+}
+
static void vmxnet3_pci_realize(PCIDevice *pci_dev, Error **errp)
{
DeviceState *dev = DEVICE(pci_dev);
@@ -2290,8 +2307,15 @@ static void vmxnet3_pci_realize(PCIDevice *pci_dev,
Error **errp)
vmxnet3_net_init(s);
- if (pci_is_express(pci_dev) && pci_bus_is_express(pci_dev->bus)) {
- pcie_endpoint_cap_init(pci_dev, VMXNET3_EXP_EP_OFFSET);
+ if (pci_is_express(pci_dev)) {
+ if (pci_bus_is_express(pci_dev->bus)) {
+ pcie_endpoint_cap_init(pci_dev, VMXNET3_EXP_EP_OFFSET);
+ }
+
+ pcie_add_capability(pci_dev, PCI_EXT_CAP_ID_DSN, 0x1,
+ VMXNET3_DSN_OFFSET, PCI_EXT_CAP_DSN_SIZEOF);
+ memcpy(pci_dev->config + VMXNET3_DSN_OFFSET + 4,
+ vmxnet3_device_serial_num(s), sizeof(uint64_t));
}
register_savevm(dev, "vmxnet3-msix", -1, 1,
--
2.5.0
- [Qemu-devel] [PULL 09/24] net/vmxnet3: return correct value for VMXNET3_CMD_GET_DEV_EXTRA_INFO, (continued)
- [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, 2016/01/11
- [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 <=
- [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
- Re: [Qemu-devel] [PULL 00/24] Net patches, Peter Maydell, 2016/01/11