From: Roger Pau Monne <roger.pau@citrix.com>
Date: Mon, 10 Sep 2012 10:13:53 +0000 (+0100)
Subject: libxl: fix error message in device_backend_callback
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~7966
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4760e67ccd29aba4406230d411ec2635dfb8f7a7;p=xen.git

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>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c
index 8e8410e214..c3283f1d88 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;
     }