diff mbox

[v2,1/9] qcow2: Fix leaks in dirty images

Message ID 1408115786-13640-2-git-send-email-mreitz@redhat.com
State New
Headers show

Commit Message

Max Reitz Aug. 15, 2014, 3:16 p.m. UTC 
When opening dirty images, qcow2's repair function should not only
repair errors but leaks as well.

Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/qcow2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Eric Blake Aug. 22, 2014, 4:09 p.m. UTC | #1 
On 08/15/2014 09:16 AM, Max Reitz wrote:
> When opening dirty images, qcow2's repair function should not only
> repair errors but leaks as well.
> 
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
>  block/qcow2.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

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

> 
> diff --git a/block/qcow2.c b/block/qcow2.c
> index 435e0e1..8faa75d 100644
> --- a/block/qcow2.c
> +++ b/block/qcow2.c
> @@ -790,7 +790,7 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags,
>          (s->incompatible_features & QCOW2_INCOMPAT_DIRTY)) {
>          BdrvCheckResult result = {0};
>  
> -        ret = qcow2_check(bs, &result, BDRV_FIX_ERRORS);
> +        ret = qcow2_check(bs, &result, BDRV_FIX_ERRORS | BDRV_FIX_LEAKS);
>          if (ret < 0) {
>              error_setg_errno(errp, -ret, "Could not repair dirty image");
>              goto fail;
>
diff mbox

Patch

diff --git a/block/qcow2.c b/block/qcow2.c
index 435e0e1..8faa75d 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -790,7 +790,7 @@  static int qcow2_open(BlockDriverState *bs, QDict *options, int flags,
         (s->incompatible_features & QCOW2_INCOMPAT_DIRTY)) {
         BdrvCheckResult result = {0};
 
-        ret = qcow2_check(bs, &result, BDRV_FIX_ERRORS);
+        ret = qcow2_check(bs, &result, BDRV_FIX_ERRORS | BDRV_FIX_LEAKS);
         if (ret < 0) {
             error_setg_errno(errp, -ret, "Could not repair dirty image");
             goto fail;