Am 13.10.2022 um 14:37 hat Paolo Bonzini geschrieben:
> From: Alberto Faria <[email protected]>
> 
> Signed-off-by: Alberto Faria <[email protected]>
> Signed-off-by: Paolo Bonzini <[email protected]>

> @@ -1699,8 +1699,8 @@ static int coroutine_fn qcow2_do_open(BlockDriverState 
> *bs, QDict *options,
>          }
>  
>          s->image_backing_file = g_malloc(len + 1);
> -        ret = bdrv_pread(bs->file, header.backing_file_offset, len,
> -                         s->image_backing_file, 0);
> +        ret = bdrv_co_pread(bs->file, header.backing_file_offset, len,
> +                            bs->auto_backing_file, 0);

This was an incorrect conflict resolution, it reverts part of commit
ec64b1ca081 (s->image_backing_file vs. bs->auto_backing_file).

I'll fix this while applying.

Kevin


Reply via email to