Patchwork blockdev: Replace "undefined error" in qmp_block_resize

login
register
mail settings
Submitter Kevin Wolf
Date May 2, 2013, 1:32 p.m.
Message ID <1367501575-23840-1-git-send-email-kwolf@redhat.com>
Download mbox | patch
Permalink /patch/240974/
State New
Headers show

Comments

Kevin Wolf - May 2, 2013, 1:32 p.m.
We have an errno value that can be displayed, so we should just do that.
An easy way to reproduce this case is to resize a raw image to a size
that is too large for the host file system.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 blockdev.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
Eric Blake - May 2, 2013, 2:04 p.m.
On 05/02/2013 07:32 AM, Kevin Wolf wrote:
> We have an errno value that can be displayed, so we should just do that.
> An easy way to reproduce this case is to resize a raw image to a size
> that is too large for the host file system.
> 
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
>  blockdev.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)

Reviewed-by: Eric Blake <eblake@redhat.com>
Stefan Hajnoczi - May 2, 2013, 2:49 p.m.
On Thu, May 02, 2013 at 03:32:55PM +0200, Kevin Wolf wrote:
> We have an errno value that can be displayed, so we should just do that.
> An easy way to reproduce this case is to resize a raw image to a size
> that is too large for the host file system.
> 
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
>  blockdev.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)

Thanks, applied to my block tree:
https://github.com/stefanha/qemu/commits/block

Stefan

Patch

diff --git a/blockdev.c b/blockdev.c
index 6e293e9..7c9d8dd 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1118,6 +1118,7 @@  int do_drive_del(Monitor *mon, const QDict *qdict, QObject **ret_data)
 void qmp_block_resize(const char *device, int64_t size, Error **errp)
 {
     BlockDriverState *bs;
+    int ret;
 
     bs = bdrv_find(device);
     if (!bs) {
@@ -1133,7 +1134,8 @@  void qmp_block_resize(const char *device, int64_t size, Error **errp)
     /* complete all in-flight operations before resizing the device */
     bdrv_drain_all();
 
-    switch (bdrv_truncate(bs, size)) {
+    ret = bdrv_truncate(bs, size);
+    switch (ret) {
     case 0:
         break;
     case -ENOMEDIUM:
@@ -1149,7 +1151,7 @@  void qmp_block_resize(const char *device, int64_t size, Error **errp)
         error_set(errp, QERR_DEVICE_IN_USE, device);
         break;
     default:
-        error_set(errp, QERR_UNDEFINED_ERROR);
+        error_setg_errno(errp, -ret, "Could not resize");
         break;
     }
 }