[PATCH] xl: Use proper path for 'do_flr' functionality.

[PATCH] xl: Use proper path for 'do_flr' functionality.

[konrad]

From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

Commit f74035d3b1e827ff6ff1873e2f10feb011a8d0d2 "xl: PCI code cleanups"
introduced an regression where it changed the name from:
/sys/bus/pci/drivers/pciback/do_flr
to
libxl_sprintf(ctx, "%s/pciback/do_flr", SYSFS_PCI_DEV);

And SYSFS_PCI_DEV is "/sys/bus/pci/devices", meaning we would
do /sys/bus/pci/devices/pciback/do_flr. The proper define
should have been SYSFS_PCIBACK_DRIVER, which is what this patch does.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---
[v2: Fix it up per Jan's review]
---
 tools/libxl/libxl_pci.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c
index 5a7cc9e..529563d 100644
--- a/tools/libxl/libxl_pci.c
+++ b/tools/libxl/libxl_pci.c
@@ -965,7 +965,7 @@ static int libxl__device_pci_reset(libxl__gc *gc, unsigned int domain, unsigned
     char *reset;
     int fd, rc;
 
-    reset = libxl__sprintf(gc, "%s/pciback/do_flr", SYSFS_PCI_DEV);
+    reset = libxl__sprintf(gc, "%s/do_flr", SYSFS_PCIBACK_DRIVER);
     fd = open(reset, O_WRONLY);
     if (fd >= 0) {
         char *buf = libxl__sprintf(gc, PCI_BDF, domain, bus, dev, func);
-- 
1.7.7.6

Re: [PATCH] xl: Use proper path for 'do_flr' functionality.

[Ian Campbell]

On Tue, 2014-07-08 at 15:00 -0400, konrad@kernel.org wrote:
> From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> 
> Commit f74035d3b1e827ff6ff1873e2f10feb011a8d0d2 "xl: PCI code cleanups"
> introduced an regression where it changed the name from:
> /sys/bus/pci/drivers/pciback/do_flr
> to
> libxl_sprintf(ctx, "%s/pciback/do_flr", SYSFS_PCI_DEV);
> 
> And SYSFS_PCI_DEV is "/sys/bus/pci/devices", meaning we would
> do /sys/bus/pci/devices/pciback/do_flr. The proper define
> should have been SYSFS_PCIBACK_DRIVER, which is what this patch does.
> 
> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

Acked and applied, correcting the title to say libxl.

Ian.

Re: [PATCH] xl: Use proper path for 'do_flr' functionality.

[Konrad Rzeszutek Wilk]

On Thu, Jul 10, 2014 at 04:23:16PM +0100, Ian Campbell wrote:
> 
> On Tue, 2014-07-08 at 15:00 -0400, konrad@kernel.org wrote:
> > From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> > 
> > Commit f74035d3b1e827ff6ff1873e2f10feb011a8d0d2 "xl: PCI code cleanups"
> > introduced an regression where it changed the name from:
> > /sys/bus/pci/drivers/pciback/do_flr
> > to
> > libxl_sprintf(ctx, "%s/pciback/do_flr", SYSFS_PCI_DEV);
> > 
> > And SYSFS_PCI_DEV is "/sys/bus/pci/devices", meaning we would
> > do /sys/bus/pci/devices/pciback/do_flr. The proper define
> > should have been SYSFS_PCIBACK_DRIVER, which is what this patch does.
> > 
> > Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> 
> Acked and applied, correcting the title to say libxl.

Duh. Thank and will be more careful in the future.
> 
> Ian.
> 
> 
> 

[PATCH] xl: Use proper path for 'do_flr' functionality.

[konrad]

From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

Commit f74035d3b1e827ff6ff1873e2f10feb011a8d0d2 "xl: PCI code cleanups"
introduced an regression where it changed the name from:
/sys/bus/pci/drivers/pciback/do_flr
to
libxl_sprintf(ctx, "%s/pciback/do_flr", SYSFS_PCI_DEV);

And SYSFS_PCI_DEV is "/sys/bus/pci/devices", meaning we would
do /sys/bus/pci/devices/pciback/do_flr. The proper define
should have been SYSFS_PCIBACK_DRIVER, which is what this patch does.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---
 tools/libxl/libxl_pci.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c
index 5a7cc9e..d3b35d8 100644
--- a/tools/libxl/libxl_pci.c
+++ b/tools/libxl/libxl_pci.c
@@ -965,7 +965,7 @@ static int libxl__device_pci_reset(libxl__gc *gc, unsigned int domain, unsigned
     char *reset;
     int fd, rc;
 
-    reset = libxl__sprintf(gc, "%s/pciback/do_flr", SYSFS_PCI_DEV);
+    reset = libxl__sprintf(gc, "%s/pciback/do_flr", SYSFS_PCIBACK_DRIVER);
     fd = open(reset, O_WRONLY);
     if (fd >= 0) {
         char *buf = libxl__sprintf(gc, PCI_BDF, domain, bus, dev, func);
-- 
1.7.7.6

Re: [PATCH] xl: Use proper path for 'do_flr' functionality.

[Jan Beulich]

>>> On 24.06.14 at 16:47, <konrad@kernel.org> wrote:
> From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> 
> Commit f74035d3b1e827ff6ff1873e2f10feb011a8d0d2 "xl: PCI code cleanups"
> introduced an regression where it changed the name from:
> /sys/bus/pci/drivers/pciback/do_flr
> to
> libxl_sprintf(ctx, "%s/pciback/do_flr", SYSFS_PCI_DEV);
> 
> And SYSFS_PCI_DEV is "/sys/bus/pci/devices", meaning we would
> do /sys/bus/pci/devices/pciback/do_flr. The proper define
> should have been SYSFS_PCIBACK_DRIVER, which is what this patch does.
> 
> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> ---
>  tools/libxl/libxl_pci.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c
> index 5a7cc9e..d3b35d8 100644
> --- a/tools/libxl/libxl_pci.c
> +++ b/tools/libxl/libxl_pci.c
> @@ -965,7 +965,7 @@ static int libxl__device_pci_reset(libxl__gc *gc, 
> unsigned int domain, unsigned
>      char *reset;
>      int fd, rc;
>  
> -    reset = libxl__sprintf(gc, "%s/pciback/do_flr", SYSFS_PCI_DEV);
> +    reset = libxl__sprintf(gc, "%s/pciback/do_flr", SYSFS_PCIBACK_DRIVER);

Don't you then need to drop the literal /pciback part here?

Jan