Patchwork [09/12] block/get_block_status: set *pnum = 0 on error

login
register
mail settings
Submitter Peter Lieven
Date Sept. 13, 2013, 10:25 a.m.
Message ID <1379067909-22984-10-git-send-email-pl@kamp.de>
Download mbox | patch
Permalink /patch/274718/
State New
Headers show

Comments

Peter Lieven - Sept. 13, 2013, 10:25 a.m.
if the call is invoked through bdrv_is_allocated the caller might
expect *pnum = 0 on error. however, a new implementation of
bdrv_get_block_status might only return a negative exit value on
error while keeping *pnum untouched.

Signed-off-by: Peter Lieven <pl@kamp.de>
---
 block.c |    1 +
 1 file changed, 1 insertion(+)
Eric Blake - Sept. 13, 2013, 6:26 p.m.
On 09/13/2013 04:25 AM, Peter Lieven wrote:
> if the call is invoked through bdrv_is_allocated the caller might
> expect *pnum = 0 on error. however, a new implementation of
> bdrv_get_block_status might only return a negative exit value on
> error while keeping *pnum untouched.
> 
> Signed-off-by: Peter Lieven <pl@kamp.de>
> ---
>  block.c |    1 +
>  1 file changed, 1 insertion(+)

Reviewed-by: Eric Blake <eblake@redhat.com>

> 
> diff --git a/block.c b/block.c
> index 76a6621..4922fb9 100644
> --- a/block.c
> +++ b/block.c
> @@ -3149,6 +3149,7 @@ static int64_t coroutine_fn bdrv_co_get_block_status(BlockDriverState *bs,
>  
>      ret = bs->drv->bdrv_co_get_block_status(bs, sector_num, nb_sectors, pnum);
>      if (ret < 0) {
> +        *pnum = 0;
>          return ret;
>      }
>  
>

Patch

diff --git a/block.c b/block.c
index 76a6621..4922fb9 100644
--- a/block.c
+++ b/block.c
@@ -3149,6 +3149,7 @@  static int64_t coroutine_fn bdrv_co_get_block_status(BlockDriverState *bs,
 
     ret = bs->drv->bdrv_co_get_block_status(bs, sector_num, nb_sectors, pnum);
     if (ret < 0) {
+        *pnum = 0;
         return ret;
     }