aboutsummaryrefslogtreecommitdiff
path: root/blockdev.c
diff options
context:
space:
mode:
authorJeff Cody <jcody@redhat.com>2013-01-18 12:45:35 -0500
committerLuiz Capitulino <lcapitulino@redhat.com>2013-01-25 10:36:26 -0200
commit58513bde833804bc9395d79fd81aae631b97c348 (patch)
tree82b4326f09101e164a967ad04e4320ef86c4b32c /blockdev.c
parent11c29918be32be5b00f367c7da9724a5cddbbb0f (diff)
downloadqemu-58513bde833804bc9395d79fd81aae631b97c348.zip
qemu-58513bde833804bc9395d79fd81aae631b97c348.tar.gz
qemu-58513bde833804bc9395d79fd81aae631b97c348.tar.bz2
block: Monitor command commit neglects to report some errors
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'. Report error using monitor_printf() and strerror(), and convert existing qerror_report() calls in do_commit() to monitor_printf(). Signed-off-by: Jeff Cody <jcody@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Diffstat (limited to 'blockdev.c')
-rw-r--r--blockdev.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/blockdev.c b/blockdev.c
index 9126587..030070b 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));
}
}