Patchwork [v2] block: do_commit() does not pass along error messages for all errors

login
register
mail settings
Submitter Jeff Cody
Date Jan. 18, 2013, 2:55 p.m.
Message ID <fb2d492bd6d672ee8d231c18492e8b56f222c719.1358520591.git.jcody@redhat.com>
Download mbox | patch
Permalink /patch/213628/
State New
Headers show

Comments

Jeff Cody - Jan. 18, 2013, 2:55 p.m.
The non-live bdrv_commit() function may return one of the following
errors: -ENOTSUP, -EBUSY, -EACCES, -EIO.  The only error that is
checked in the HMP handler is -EBUSY, so the monitor command 'commit'
silently fails for all error cases other than 'Device is in use'.
Return error using monitor_printf() and strerror(), and covert existing
qerror_report() calls in do_commit() to use monitor_printf().

Signed-off-by: Jeff Cody <jcody@redhat.com>
---
 blockdev.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)
Markus Armbruster - Jan. 18, 2013, 5:11 p.m.
Jeff Cody <jcody@redhat.com> writes:

> The non-live bdrv_commit() function may return one of the following
> errors: -ENOTSUP, -EBUSY, -EACCES, -EIO.  The only error that is
> checked in the HMP handler is -EBUSY, so the monitor command 'commit'
> silently fails for all error cases other than 'Device is in use'.
> Return error using monitor_printf() and strerror(), and covert existing

s/covert/convert/

Suggest "Report error".

In the same vein, subject could be

    block: Monitor command commit neglects to report some errors

> qerror_report() calls in do_commit() to use monitor_printf().

Patch looks good to me.
Jeff Cody - Jan. 18, 2013, 5:47 p.m.
On Fri, Jan 18, 2013 at 06:11:25PM +0100, Markus Armbruster wrote:
> Jeff Cody <jcody@redhat.com> writes:
> 
> > The non-live bdrv_commit() function may return one of the following
> > errors: -ENOTSUP, -EBUSY, -EACCES, -EIO.  The only error that is
> > checked in the HMP handler is -EBUSY, so the monitor command 'commit'
> > silently fails for all error cases other than 'Device is in use'.
> > Return error using monitor_printf() and strerror(), and covert existing
> 
> s/covert/convert/
> 
> Suggest "Report error".
> 
> In the same vein, subject could be
> 
>     block: Monitor command commit neglects to report some errors
> 
> > qerror_report() calls in do_commit() to use monitor_printf().
> 
> Patch looks good to me.

Thanks - I went ahead and submitted a v3 with the proposed commit
message changes.

Thanks,
Jeff

Patch

diff --git a/blockdev.c b/blockdev.c
index d724e2d..cb3b426 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -642,21 +642,17 @@  void do_commit(Monitor *mon, const QDict *qdict)
 
     if (!strcmp(device, "all")) {
         ret = bdrv_commit_all();
-        if (ret == -EBUSY) {
-            qerror_report(QERR_DEVICE_IN_USE, device);
-            return;
-        }
     } else {
         bs = bdrv_find(device);
         if (!bs) {
-            qerror_report(QERR_DEVICE_NOT_FOUND, device);
+            monitor_printf(mon, "Device '%s' not found\n", device);
             return;
         }
         ret = bdrv_commit(bs);
-        if (ret == -EBUSY) {
-            qerror_report(QERR_DEVICE_IN_USE, device);
-            return;
-        }
+    }
+    if (ret < 0) {
+        monitor_printf(mon, "'commit' error for '%s': %s\n", device,
+                       strerror(-ret));
     }
 }