Re: [Xen-devel] [PATCH v2 1/2] tools/libxl/libxl_pci.c: Extract sysfs_dev_get_class from libxl__grant_vga_iomem_permission

[Wei Liu <wei.liu2@xxxxxxxxxx>]

On Mon, Jul 03, 2017 at 03:25:52AM +0800, Xiong Zhang wrote:
> No functional change. Just extract this function for next patch and avoid
> code repetition.
> 
> Signed-off-by: Xiong Zhang <xiong.y.zhang@xxxxxxxxx>

Acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>

Note to self: maybe add some blank lines while committing.

> ---
>     Changes in v2:
>         -Add No functional change in commit message
>         -Use 'goto out' style error handling
> ---
>  tools/libxl/libxl_pci.c | 47 +++++++++++++++++++++++++++++------------------
>  1 file changed, 29 insertions(+), 18 deletions(-)
> 
> diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c
> index b14df16..d109930 100644
> --- a/tools/libxl/libxl_pci.c
> +++ b/tools/libxl/libxl_pci.c
> @@ -531,6 +531,34 @@ static uint16_t sysfs_dev_get_device(libxl__gc *gc, 
> libxl_device_pci *pcidev)
>      return pci_device_device;
>  }
>  
> +static int sysfs_dev_get_class(libxl__gc *gc, libxl_device_pci *pcidev,
> +                               unsigned long *class)
> +{
> +    char *pci_device_class_path = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/class",
> +                     pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func);
> +    int read_items, ret = 0;
> +
> +    FILE *f = fopen(pci_device_class_path, "r");
> +    if (!f) {
> +        LOGE(ERROR,
> +             "pci device "PCI_BDF" does not have class attribute",
> +             pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func);
> +        ret = ERROR_FAIL;
> +        goto out;
> +    }

Here.

> +    read_items = fscanf(f, "0x%lx\n", class);

Here.

> +    fclose(f);

Here.

> +    if (read_items != 1) {
> +        LOGE(ERROR,
> +             "cannot read class of pci device "PCI_BDF,
> +             pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func);
> +        ret = ERROR_FAIL;
> +    }
> +
> +out:
> +    return ret;
> +}
> +

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
https://lists.xen.org/xen-devel