From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41503) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b7dzR-00008j-JB for qemu-devel@nongnu.org; Tue, 31 May 2016 03:21:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b7dzP-0008SI-L6 for qemu-devel@nongnu.org; Tue, 31 May 2016 03:21:24 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:36544) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b7dzP-0008SD-AA for qemu-devel@nongnu.org; Tue, 31 May 2016 03:21:23 -0400 Received: by mail-wm0-x244.google.com with SMTP id q62so29684179wmg.3 for ; Tue, 31 May 2016 00:21:23 -0700 (PDT) From: Dmitry Fleytman Date: Tue, 31 May 2016 10:20:48 +0300 Message-Id: <1464679259-1378-7-git-send-email-dmitry@daynix.com> In-Reply-To: <1464679259-1378-1-git-send-email-dmitry@daynix.com> References: <1464679259-1378-1-git-send-email-dmitry@daynix.com> Subject: [Qemu-devel] [PATCH v7 06/17] vmxnet3: Use generic function for DSN capability definition List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Jason Wang , "Michael S. Tsirkin" , Yan Vugenfirer , Leonid Bloch , Shmulik Ladkani From: Dmitry Fleytman Signed-off-by: Dmitry Fleytman Signed-off-by: Leonid Bloch --- 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.5.5