Patchwork [v2] block/cow.c : return real error code in cow.c

login
register
mail settings
Submitter Zhi Hui Li
Date Dec. 9, 2011, 7:58 a.m.
Message ID <1323417518-10195-1-git-send-email-zhihuili@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/130313/
State New
Headers show

Comments

Zhi Hui Li - Dec. 9, 2011, 7:58 a.m.
v2: modify some errors

Signed-off-by: Li Zhi Hui <zhihuili@linux.vnet.ibm.com>
---
 block/cow.c |   31 ++++++++++++++++++-------------
 1 files changed, 18 insertions(+), 13 deletions(-)
Kevin Wolf - Dec. 9, 2011, 10:57 a.m.
Am 09.12.2011 08:58, schrieb Li Zhi Hui:
> v2: modify some errors
> 
> Signed-off-by: Li Zhi Hui <zhihuili@linux.vnet.ibm.com>
> ---
>  block/cow.c |   31 ++++++++++++++++++-------------
>  1 files changed, 18 insertions(+), 13 deletions(-)
> 
> diff --git a/block/cow.c b/block/cow.c
> index 3c52735..51ca681 100644
> --- a/block/cow.c
> +++ b/block/cow.c
> @@ -64,15 +64,17 @@ static int cow_open(BlockDriverState *bs, int flags)
>      struct cow_header_v2 cow_header;
>      int bitmap_size;
>      int64_t size;
> +    int ret;
>  
>      /* see if it is a cow image */
> -    if (bdrv_pread(bs->file, 0, &cow_header, sizeof(cow_header)) !=
> -            sizeof(cow_header)) {
> +    ret = bdrv_pread(bs->file, 0, &cow_header, sizeof(cow_header));
> +    if (ret < 0) {
>          goto fail;
>      }
>  
>      if (be32_to_cpu(cow_header.magic) != COW_MAGIC ||
>          be32_to_cpu(cow_header.version) != COW_VERSION) {
> +        ret = -1;

ret is interpreted as -errno by the caller, so usually on Linux systems
you'll get a -EPERM (Operation not permitted) error message, which
doesn't describe the error very well.

I think a better return value for a wrong magic would be -EINVAL. For a
wrong version have a look at the qcow2 code (qerror_report and -ENOTSUP).

Kevin

Patch

diff --git a/block/cow.c b/block/cow.c
index 3c52735..51ca681 100644
--- a/block/cow.c
+++ b/block/cow.c
@@ -64,15 +64,17 @@  static int cow_open(BlockDriverState *bs, int flags)
     struct cow_header_v2 cow_header;
     int bitmap_size;
     int64_t size;
+    int ret;
 
     /* see if it is a cow image */
-    if (bdrv_pread(bs->file, 0, &cow_header, sizeof(cow_header)) !=
-            sizeof(cow_header)) {
+    ret = bdrv_pread(bs->file, 0, &cow_header, sizeof(cow_header));
+    if (ret < 0) {
         goto fail;
     }
 
     if (be32_to_cpu(cow_header.magic) != COW_MAGIC ||
         be32_to_cpu(cow_header.version) != COW_VERSION) {
+        ret = -1;
         goto fail;
     }
 
@@ -88,7 +90,7 @@  static int cow_open(BlockDriverState *bs, int flags)
     qemu_co_mutex_init(&s->lock);
     return 0;
  fail:
-    return -1;
+    return ret;
 }
 
 /*
@@ -182,17 +184,19 @@  static int coroutine_fn cow_read(BlockDriverState *bs, int64_t sector_num,
             ret = bdrv_pread(bs->file,
                         s->cow_sectors_offset + sector_num * 512,
                         buf, n * 512);
-            if (ret != n * 512)
-                return -1;
+            if (ret < 0) {
+                return ret;
+            }
         } else {
             if (bs->backing_hd) {
                 /* read from the base image */
                 ret = bdrv_read(bs->backing_hd, sector_num, buf, n);
-                if (ret < 0)
-                    return -1;
+                if (ret < 0) {
+                    return ret;
+                }
             } else {
-            memset(buf, 0, n * 512);
-        }
+                memset(buf, 0, n * 512);
+            }
         }
         nb_sectors -= n;
         sector_num += n;
@@ -220,8 +224,9 @@  static int cow_write(BlockDriverState *bs, int64_t sector_num,
 
     ret = bdrv_pwrite(bs->file, s->cow_sectors_offset + sector_num * 512,
                       buf, nb_sectors * 512);
-    if (ret != nb_sectors * 512)
-        return -1;
+    if (ret < 0) {
+        return ret;
+    }
 
     return cow_update_bitmap(bs, sector_num, nb_sectors);
 }
@@ -288,14 +293,14 @@  static int cow_create(const char *filename, QEMUOptionParameter *options)
     cow_header.sectorsize = cpu_to_be32(512);
     cow_header.size = cpu_to_be64(image_sectors * 512);
     ret = bdrv_pwrite(cow_bs, 0, &cow_header, sizeof(cow_header));
-    if (ret != sizeof(cow_header)) {
+    if (ret < 0) {
         goto exit;
     }
 
     /* resize to include at least all the bitmap */
     ret = bdrv_truncate(cow_bs,
         sizeof(cow_header) + ((image_sectors + 7) >> 3));
-    if (ret) {
+    if (ret < 0) {
         goto exit;
     }