[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 05/16] vmxnet3: Use generic function for DSN capa
From: |
Dmitry Fleytman |
Subject: |
[Qemu-devel] [PATCH v4 05/16] vmxnet3: Use generic function for DSN capability definition |
Date: |
Sun, 10 Apr 2016 18:14:54 +0300 |
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 v4 00/16] Introduce Intel 82574 GbE Controller Emulation (e1000e), Dmitry Fleytman, 2016/04/10
- [Qemu-devel] [PATCH v4 02/16] pci: Introduce define for PM capability version 1.1, Dmitry Fleytman, 2016/04/10
- [Qemu-devel] [PATCH v4 01/16] msix: make msix_clr_pending() visible for clients, Dmitry Fleytman, 2016/04/10
- [Qemu-devel] [PATCH v4 03/16] pcie: Add support for PCIe CAP v1, Dmitry Fleytman, 2016/04/10
- [Qemu-devel] [PATCH v4 05/16] vmxnet3: Use generic function for DSN capability definition,
Dmitry Fleytman <=
- [Qemu-devel] [PATCH v4 04/16] pcie: Introduce function for DSN capability creation, Dmitry Fleytman, 2016/04/10
- [Qemu-devel] [PATCH v4 06/16] net: Introduce Toeplitz hash calculator, Dmitry Fleytman, 2016/04/10
- [Qemu-devel] [PATCH v4 07/16] net: Add macros for MAC address tracing, Dmitry Fleytman, 2016/04/10
- [Qemu-devel] [PATCH v4 10/16] rtl8139: Move more TCP definitions to common header, Dmitry Fleytman, 2016/04/10
- [Qemu-devel] [PATCH v4 08/16] vmxnet3: Use common MAC address tracing macros, Dmitry Fleytman, 2016/04/10
- [Qemu-devel] [PATCH v4 12/16] vmxnet3: Use pci_dma_* API instead of cpu_physical_memory_*, Dmitry Fleytman, 2016/04/10
- [Qemu-devel] [PATCH v4 13/16] e1000_regs: Add definitions for Intel 82574-specific bits, Dmitry Fleytman, 2016/04/10
- [Qemu-devel] [PATCH v4 14/16] e1000: Move out code that will be reused in e1000e, Dmitry Fleytman, 2016/04/10
- [Qemu-devel] [PATCH v4 11/16] net_pkt: Extend packet abstraction as required by e1000e functionality, Dmitry Fleytman, 2016/04/10
- [Qemu-devel] [PATCH v4 16/16] e1000e: Introduce qtest for e1000e device, Dmitry Fleytman, 2016/04/10