Roger Pau Monne
2012-Sep-04 15:29 UTC
[PATCH] libxl: fix error message in device_backend_callback
device_backend_callback error path always says "unable to disconnect",
but this can also happen during the connection of a device. Fix the
error message using the information in aodev->action.
Signed-off-by: Roger Pau Monne <roger.pau@citrix.com>
---
tools/libxl/libxl_device.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c
index 8e8410e..c3283f1 100644
--- a/tools/libxl/libxl_device.c
+++ b/tools/libxl/libxl_device.c
@@ -854,7 +854,8 @@ static void device_backend_callback(libxl__egc *egc,
libxl__ev_devstate *ds,
}
if (rc) {
- LOG(ERROR, "unable to disconnect device with path %s",
+ LOG(ERROR, "unable to %s device with path %s",
+ aodev->action == DEVICE_CONNECT ? "connect" :
"disconnect",
libxl__device_backend_path(gc, aodev->dev));
goto out;
}
--
1.7.7.5 (Apple Git-26)
Ian Campbell
2012-Sep-10 10:15 UTC
Re: [PATCH] libxl: fix error message in device_backend_callback
On Tue, 2012-09-04 at 16:29 +0100, Roger Pau Monne wrote:> device_backend_callback error path always says "unable to disconnect", > but this can also happen during the connection of a device. Fix the > error message using the information in aodev->action. > > Signed-off-by: Roger Pau Monne <roger.pau@citrix.com>Acked-by: Ian Campbell <ian.campbell@citrix.com> and applied. Jan, can we consider this one for 4.2.1 please. Ian.> --- > tools/libxl/libxl_device.c | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c > index 8e8410e..c3283f1 100644 > --- a/tools/libxl/libxl_device.c > +++ b/tools/libxl/libxl_device.c > @@ -854,7 +854,8 @@ static void device_backend_callback(libxl__egc *egc, libxl__ev_devstate *ds, > } > > if (rc) { > - LOG(ERROR, "unable to disconnect device with path %s", > + LOG(ERROR, "unable to %s device with path %s", > + aodev->action == DEVICE_CONNECT ? "connect" : "disconnect", > libxl__device_backend_path(gc, aodev->dev)); > goto out; > }