diff mbox

[05/13] vmxnet3: Use generic function for DSN capability definition

Message ID 1455790054-1952-6-git-send-email-leonid.bloch@ravellosystems.com (mailing list archive)
State New, archived
Headers show

Commit Message

Leonid Bloch Feb. 18, 2016, 10:07 a.m. UTC
From: Dmitry Fleytman <dmitry.fleytman@ravellosystems.com>

Signed-off-by: Dmitry Fleytman <dmitry.fleytman@ravellosystems.com>
Signed-off-by: Leonid Bloch <leonid.bloch@ravellosystems.com>
---
 hw/net/vmxnet3.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Comments

Michael S. Tsirkin Feb. 18, 2016, 10:46 a.m. UTC | #1
On Thu, Feb 18, 2016 at 12:07:26PM +0200, Leonid Bloch wrote:
> From: Dmitry Fleytman <dmitry.fleytman@ravellosystems.com>
> 
> Signed-off-by: Dmitry Fleytman <dmitry.fleytman@ravellosystems.com>
> Signed-off-by: Leonid Bloch <leonid.bloch@ravellosystems.com>
> ---
>  hw/net/vmxnet3.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c
> index 093a71e..43f7a34 100644
> --- a/hw/net/vmxnet3.c
> +++ b/hw/net/vmxnet3.c
> @@ -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_dsn_init(pci_dev, VMXNET3_DSN_OFFSET,
> +                      *(uint64_t *) vmxnet3_device_serial_num(s));

Can't we fix the API to avoid the cast?

>      }
>  
>      register_savevm(dev, "vmxnet3-msix", -1, 1,
> -- 
> 2.5.0
Leonid Bloch Feb. 22, 2016, 4:44 p.m. UTC | #2
On Thu, Feb 18, 2016 at 12:46 PM, Michael S. Tsirkin <mst@redhat.com> wrote:
> On Thu, Feb 18, 2016 at 12:07:26PM +0200, Leonid Bloch wrote:
>> From: Dmitry Fleytman <dmitry.fleytman@ravellosystems.com>
>>
>> Signed-off-by: Dmitry Fleytman <dmitry.fleytman@ravellosystems.com>
>> Signed-off-by: Leonid Bloch <leonid.bloch@ravellosystems.com>
>> ---
>>  hw/net/vmxnet3.c | 6 ++----
>>  1 file changed, 2 insertions(+), 4 deletions(-)
>>
>> diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c
>> index 093a71e..43f7a34 100644
>> --- a/hw/net/vmxnet3.c
>> +++ b/hw/net/vmxnet3.c
>> @@ -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_dsn_init(pci_dev, VMXNET3_DSN_OFFSET,
>> +                      *(uint64_t *) vmxnet3_device_serial_num(s));
>
> Can't we fix the API to avoid the cast?

Fixed in v2. Thanks!

>
>>      }
>>
>>      register_savevm(dev, "vmxnet3-msix", -1, 1,
>> --
>> 2.5.0
diff mbox

Patch

diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c
index 093a71e..43f7a34 100644
--- a/hw/net/vmxnet3.c
+++ b/hw/net/vmxnet3.c
@@ -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_dsn_init(pci_dev, VMXNET3_DSN_OFFSET,
+                      *(uint64_t *) vmxnet3_device_serial_num(s));
     }
 
     register_savevm(dev, "vmxnet3-msix", -1, 1,