diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2014-07-07 16:38:58 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2014-07-09 15:50:11 +0200 |
| commit | d40593dd9033d39a5e4cc32915c5eb28f3e858b6 (patch) | |
| tree | cdfb304e99958e6c5f9643fc2f95609c2dc00029 /block/backup.c | |
| parent | 675879f6f3c9463e103735a4e41e9deb0bee9b39 (diff) | |
| download | qemu-d40593dd9033d39a5e4cc32915c5eb28f3e858b6.zip | |
block/backup: Fix hang for unaligned image size
When doing a block backup of an image with an unaligned size (with
respect to the BACKUP_CLUSTER_SIZE), qemu would check the allocation
status of sectors after the end of the image. bdrv_is_allocated()
returns a result that is valid for 0 sectors in this case, so the backup
job ran into an endless loop.
Stop looping when seeing a result valid for 0 sectors, we're at EOF then.
The test case looks somewhat unrelated at first sight because I
originally tried to reproduce a different suspected bug that turned out
to not exist. Still a good test case and it accidentally found this one.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'block/backup.c')
| -rw-r--r-- | block/backup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/backup.c b/block/backup.c index 7978ae2e50..d0b02255ce 100644 --- a/block/backup.c +++ b/block/backup.c @@ -307,7 +307,7 @@ static void coroutine_fn backup_run(void *opaque) BACKUP_SECTORS_PER_CLUSTER - i, &n); i += n; - if (alloced == 1) { + if (alloced == 1 || n == 0) { break; } } |