| Message ID | 253441199a31e729d56d7d6b1eede1c1634377ad.1431523498.git.berto@igalia.com |
|---|---|
| State | New |
| Headers | show |
On Wed, 05/13 16:27, Alberto Garcia wrote: > We need to call stream_complete() in order to do all the necessary > clean-ups, even if there's an early failure. At the moment it's only > useful to make sure that s->backing_file_str is not leaked, but it > will become more important as we introduce support for streaming to > any intermediate node. > > Signed-off-by: Alberto Garcia <berto@igalia.com> > Reviewed-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Fam Zheng <famz@redhat.com> > --- > block/stream.c | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) > > diff --git a/block/stream.c b/block/stream.c > index a628901..37bfd8b 100644 > --- a/block/stream.c > +++ b/block/stream.c > @@ -114,21 +114,21 @@ static void coroutine_fn stream_run(void *opaque) > StreamCompleteData *data; > BlockDriverState *bs = s->common.bs; > BlockDriverState *base = s->base; > - int64_t sector_num, end; > + int64_t sector_num = 0; > + int64_t end = -1; > int error = 0; > int ret = 0; > int n = 0; > void *buf; > > if (!bs->backing_hd) { > - block_job_completed(&s->common, 0); > - return; > + goto out; > } > > s->common.len = bdrv_getlength(bs); > if (s->common.len < 0) { > - block_job_completed(&s->common, s->common.len); > - return; > + ret = s->common.len; > + goto out; > } > > end = s->common.len >> BDRV_SECTOR_BITS; > @@ -215,6 +215,7 @@ wait: > > qemu_vfree(buf); > > +out: > /* Modify backing chain and close BDSes in main loop */ > data = g_malloc(sizeof(*data)); > data->ret = ret; > -- > 2.1.4 > >
diff --git a/block/stream.c b/block/stream.c index a628901..37bfd8b 100644 --- a/block/stream.c +++ b/block/stream.c @@ -114,21 +114,21 @@ static void coroutine_fn stream_run(void *opaque) StreamCompleteData *data; BlockDriverState *bs = s->common.bs; BlockDriverState *base = s->base; - int64_t sector_num, end; + int64_t sector_num = 0; + int64_t end = -1; int error = 0; int ret = 0; int n = 0; void *buf; if (!bs->backing_hd) { - block_job_completed(&s->common, 0); - return; + goto out; } s->common.len = bdrv_getlength(bs); if (s->common.len < 0) { - block_job_completed(&s->common, s->common.len); - return; + ret = s->common.len; + goto out; } end = s->common.len >> BDRV_SECTOR_BITS; @@ -215,6 +215,7 @@ wait: qemu_vfree(buf); +out: /* Modify backing chain and close BDSes in main loop */ data = g_malloc(sizeof(*data)); data->ret = ret;