Re: [Xen-devel] [PATCH 1 of 4] libxl: Make a helper function write a BDF to a sysfs path

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Wed, 2012-05-09 at 11:28 +0100, George Dunlap wrote:
> This functionality will be used several times in subsequent patches.
> 
> Signed-off-by: George Dunlap <george.dunlap@xxxxxxxxxxxxx>

Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>

> diff -r d5268710a5ca -r 0772f1d07d1c tools/libxl/libxl_pci.c
> --- a/tools/libxl/libxl_pci.c Fri May 04 10:46:23 2012 +0100
> +++ b/tools/libxl/libxl_pci.c Tue May 08 17:18:31 2012 +0100
> @@ -327,6 +327,36 @@ static int is_pcidev_in_array(libxl_devi
>      return 0;
>  }
>  
> +/* Write the standard BDF into the sysfs path given by sysfs_path. */
> +static int sysfs_write_bdf(libxl__gc *gc, const char * sysfs_path,
> +                           libxl_device_pci *pcidev)
> +{
> +    libxl_ctx *ctx = libxl__gc_owner(gc);
> +    int rc, fd;
> +    char *buf;
> +
> +    fd = open(sysfs_path, O_WRONLY);
> +    if (fd < 0) {
> +        LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Couldn't open %s",
> +                         sysfs_path);
> +        return ERROR_FAIL;
> +    }
> +        
> +    buf = libxl__sprintf(gc, PCI_BDF, pcidev->domain, pcidev->bus,
> +                         pcidev->dev, pcidev->func);
> +    rc = write(fd, buf, strlen(buf));
> +    /* Annoying to have two if's, but we need the errno */
> +    if (rc < 0)
> +        LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR,
> +                         "write to %s returned %d", sysfs_path, rc);
> +    close(fd);
> +
> +    if (rc < 0)
> +        return ERROR_FAIL;
> +
> +    return 0;
> +}
> +
>  libxl_device_pci *libxl_device_pci_list_assignable(libxl_ctx *ctx, int *num)
>  {
>      GC_INIT(ctx);
> @@ -571,27 +601,12 @@ static int do_pci_add(libxl__gc *gc, uin
>  
>          /* Don't restrict writes to the PCI config space from this VM */
>          if (pcidev->permissive) {
> -            int fd;
> -            char *buf;
> -            
> -            sysfs_path = libxl__sprintf(gc, 
> SYSFS_PCIBACK_DRIVER"/permissive");
> -            fd = open(sysfs_path, O_WRONLY);
> -            if (fd < 0) {
> -                LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Couldn't open %s",
> -                                 sysfs_path);
> +            if ( sysfs_write_bdf(gc, SYSFS_PCIBACK_DRIVER"/permissive",
> +                                 pcidev) < 0 ) {
> +                LIBXL__LOG(ctx, LIBXL__LOG_ERROR,
> +                           "Setting permissive for device");
>                  return ERROR_FAIL;
>              }
> - 
> -            buf = libxl__sprintf(gc, PCI_BDF, pcidev->domain, pcidev->bus,
> -                                 pcidev->dev, pcidev->func);
> -            rc = write(fd, buf, strlen(buf));
> -            /* Annoying to have two if's, but we need the errno */
> -            if (rc < 0)
> -                LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR,
> -                                 "write to %s returned %d", sysfs_path, rc);
> -            close(fd);
> -            if (rc < 0)
> -                return ERROR_FAIL;
>          }
>          break;
>      }
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@xxxxxxxxxxxxx
> http://lists.xen.org/xen-devel



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