[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 05/13] vmxnet3: Use generic function for DSN capa
From: |
Leonid Bloch |
Subject: |
[Qemu-devel] [PATCH v2 05/13] vmxnet3: Use generic function for DSN capability definition |
Date: |
Mon, 22 Feb 2016 19:37:23 +0200 |
From: Dmitry Fleytman <address@hidden>
Signed-off-by: Dmitry Fleytman <address@hidden>
Signed-off-by: Leonid Bloch <address@hidden>
---
hw/net/vmxnet3.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c
index 093a71e..0a4db4d 100644
--- a/hw/net/vmxnet3.c
+++ b/hw/net/vmxnet3.c
@@ -2255,9 +2255,9 @@ static const MemoryRegionOps b1_ops = {
},
};
-static uint8_t *vmxnet3_device_serial_num(VMXNET3State *s)
+static uint64_t vmxnet3_device_serial_num(VMXNET3State *s)
{
- static uint64_t dsn_payload;
+ uint64_t dsn_payload;
uint8_t *dsnp = (uint8_t *)&dsn_payload;
dsnp[0] = 0xfe;
@@ -2268,7 +2268,7 @@ static uint8_t *vmxnet3_device_serial_num(VMXNET3State *s)
dsnp[5] = s->conf.macaddr.a[1];
dsnp[6] = s->conf.macaddr.a[2];
dsnp[7] = 0xff;
- return dsnp;
+ return dsn_payload;
}
static void vmxnet3_pci_realize(PCIDevice *pci_dev, Error **errp)
@@ -2313,10 +2313,8 @@ static void vmxnet3_pci_realize(PCIDevice *pci_dev,
Error **errp)
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));
+ pcie_dev_ser_num_init(pci_dev, VMXNET3_DSN_OFFSET,
+ vmxnet3_device_serial_num(s));
}
register_savevm(dev, "vmxnet3-msix", -1, 1,
--
2.5.0
- [Qemu-devel] [PATCH v2 00/13] Introduce Intel 82574 GbE Controller Emulation (e1000e), Leonid Bloch, 2016/02/22
- [Qemu-devel] [PATCH v2 02/13] pci: Introduce define for PM capability version 1.1, Leonid Bloch, 2016/02/22
- [Qemu-devel] [PATCH v2 01/13] msix: make msix_clr_pending() visible for clients, Leonid Bloch, 2016/02/22
- [Qemu-devel] [PATCH v2 03/13] pcie: Add support for PCIe CAP v1, Leonid Bloch, 2016/02/22
- [Qemu-devel] [PATCH v2 04/13] pcie: Introduce function for DSN capability creation, Leonid Bloch, 2016/02/22
- [Qemu-devel] [PATCH v2 05/13] vmxnet3: Use generic function for DSN capability definition,
Leonid Bloch <=
- [Qemu-devel] [PATCH v2 07/13] net: Add macros for MAC address tracing, Leonid Bloch, 2016/02/22
- [Qemu-devel] [PATCH v2 08/13] vmxnet3: Use common MAC address tracing macros, Leonid Bloch, 2016/02/22
- [Qemu-devel] [PATCH v2 06/13] net: Introduce Toeplitz hash calculator, Leonid Bloch, 2016/02/22
- [Qemu-devel] [PATCH v2 10/13] rtl8139: Move more TCP definitions to common header, Leonid Bloch, 2016/02/22
- [Qemu-devel] [PATCH v2 09/13] net_pkt: Name vmxnet3 packet abstractions more generic, Leonid Bloch, 2016/02/22
- [Qemu-devel] [PATCH v2 12/13] e1000_regs: Add definitions for Intel 82574-specific bits, Leonid Bloch, 2016/02/22
- [Qemu-devel] [PATCH v2 11/13] net_pkt: Extend packet abstraction as required by e1000e functionality, Leonid Bloch, 2016/02/22
- [Qemu-devel] [PATCH v2 13/13] net: Introduce e1000e device emulation, Leonid Bloch, 2016/02/22