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

[Wei Liu]

On Fri, Jun 30, 2017 at 12:11:26PM +0800, Xiong Zhang wrote:

It would be better in the future you say "No functional change" here.

> Signed-off-by: Xiong Zhang 
> ---
>  tools/libxl/libxl_pci.c | 45 +++--
>  1 file changed, 27 insertions(+), 18 deletions(-)
> 
> diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c
> index b14df16..cefd7d8 100644
> --- a/tools/libxl/libxl_pci.c
> +++ b/tools/libxl/libxl_pci.c
> @@ -531,6 +531,32 @@ 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;
> +
> +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);
> +return ERROR_FAIL;
> +}
> +read_items = fscanf(f, "0x%lx\n", class);
> +fclose(f);
> +if (read_items != 1) {
> +LOGE(ERROR,
> + "cannot read class of pci device "PCI_BDF,
> + pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func);
> +return ERROR_FAIL;
> +}
> +

Please use "goto out" style error handling.

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

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

[Xiong Zhang]

Signed-off-by: Xiong Zhang 
---
 tools/libxl/libxl_pci.c | 45 +++--
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c
index b14df16..cefd7d8 100644
--- a/tools/libxl/libxl_pci.c
+++ b/tools/libxl/libxl_pci.c
@@ -531,6 +531,32 @@ 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;
+
+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);
+return ERROR_FAIL;
+}
+read_items = fscanf(f, "0x%lx\n", class);
+fclose(f);
+if (read_items != 1) {
+LOGE(ERROR,
+ "cannot read class of pci device "PCI_BDF,
+ pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func);
+return ERROR_FAIL;
+}
+
+return 0;
+}
+
 typedef struct {
 uint16_t vendor;
 uint16_t device;
@@ -1652,27 +1678,10 @@ int libxl__grant_vga_iomem_permission(libxl__gc *gc, 
const uint32_t domid,
 uint64_t vga_iomem_start = 0xa >> XC_PAGE_SHIFT;
 uint32_t stubdom_domid;
 libxl_device_pci *pcidev = _config->pcidevs[i];
-char *pci_device_class_path =
-GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/class",
-  pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func);
-int read_items;
 unsigned long pci_device_class;
 
-FILE *f = fopen(pci_device_class_path, "r");
-if (!f) {
-LOGED(ERROR, domid,
-  "pci device "PCI_BDF" does not have class attribute",
-  pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func);
-continue;
-}
-read_items = fscanf(f, "0x%lx\n", _device_class);
-fclose(f);
-if (read_items != 1) {
-LOGED(ERROR, domid,
-  "cannot read class of pci device "PCI_BDF,
-  pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func);
+if (sysfs_dev_get_class(gc, pcidev, _device_class))
 continue;
-}
 if (pci_device_class != 0x03) /* VGA class */
 continue;
 
-- 
2.7.4


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