[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL V3 07/20] vmxnet3: Use generic function for DSN capab
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL V3 07/20] vmxnet3: Use generic function for DSN capability definition |
Date: |
Thu, 26 May 2016 10:16:22 +0800 |
From: Dmitry Fleytman <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Dmitry Fleytman <address@hidden>
Signed-off-by: Leonid Bloch <address@hidden>
Signed-off-by: Jason Wang <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 20f26b7..586e915 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.7.4
- [Qemu-devel] [PULL V3 00/20] Net patches, Jason Wang, 2016/05/25
- [Qemu-devel] [PULL V3 02/20] net: mipsnet: check packet length against buffer, Jason Wang, 2016/05/25
- [Qemu-devel] [PULL V3 01/20] net/tap: Allocating Large sized arrays to heap, Jason Wang, 2016/05/25
- [Qemu-devel] [PULL V3 03/20] msix: make msix_clr_pending() visible for clients, Jason Wang, 2016/05/25
- [Qemu-devel] [PULL V3 04/20] pci: Introduce define for PM capability version 1.1, Jason Wang, 2016/05/25
- [Qemu-devel] [PULL V3 06/20] pcie: Introduce function for DSN capability creation, Jason Wang, 2016/05/25
- [Qemu-devel] [PULL V3 05/20] pcie: Add support for PCIe CAP v1, Jason Wang, 2016/05/25
- [Qemu-devel] [PULL V3 07/20] vmxnet3: Use generic function for DSN capability definition,
Jason Wang <=
- [Qemu-devel] [PULL V3 08/20] net: Introduce Toeplitz hash calculator, Jason Wang, 2016/05/25
- [Qemu-devel] [PULL V3 10/20] vmxnet3: Use common MAC address tracing macros, Jason Wang, 2016/05/25
- [Qemu-devel] [PULL V3 09/20] net: Add macros for MAC address tracing, Jason Wang, 2016/05/25
- [Qemu-devel] [PULL V3 12/20] rtl8139: Move more TCP definitions to common header, Jason Wang, 2016/05/25
- [Qemu-devel] [PULL V3 11/20] net_pkt: Name vmxnet3 packet abstractions more generic, Jason Wang, 2016/05/25
- [Qemu-devel] [PULL V3 14/20] vmxnet3: Use pci_dma_* API instead of cpu_physical_memory_*, Jason Wang, 2016/05/25
- [Qemu-devel] [PULL V3 13/20] net_pkt: Extend packet abstraction as required by e1000e functionality, Jason Wang, 2016/05/25
- [Qemu-devel] [PULL V3 15/20] e1000_regs: Add definitions for Intel 82574-specific bits, Jason Wang, 2016/05/25
- [Qemu-devel] [PULL V3 16/20] e1000: Move out code that will be reused in e1000e, Jason Wang, 2016/05/25
- [Qemu-devel] [PULL V3 18/20] e1000e: Introduce qtest for e1000e device, Jason Wang, 2016/05/25