| Message ID | 1442589793-7105-3-git-send-email-mreitz@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 09/18/2015 09:22 AM, Max Reitz wrote: > This flag should not be set for the root BDS only, but for any BDS that > is being created while incoming migration is pending, so setting it is > moved from blockdev_init() to bdrv_fill_options(). > > Signed-off-by: Max Reitz <mreitz@redhat.com> > --- > block.c | 4 ++++ > blockdev.c | 4 ---- > 2 files changed, 4 insertions(+), 4 deletions(-) Reviewed-by: Eric Blake <eblake@redhat.com>
On Fri 18 Sep 2015 05:22:37 PM CEST, Max Reitz wrote: > This flag should not be set for the root BDS only, but for any BDS that > is being created while incoming migration is pending, so setting it is > moved from blockdev_init() to bdrv_fill_options(). > > Signed-off-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Alberto Garcia <berto@igalia.com> Berto
diff --git a/block.c b/block.c index 6268e37..51d8c51 100644 --- a/block.c +++ b/block.c @@ -1076,6 +1076,10 @@ static int bdrv_fill_options(QDict **options, const char **pfilename, } } + if (runstate_check(RUN_STATE_INMIGRATE)) { + *flags |= BDRV_O_INCOMING; + } + return 0; } diff --git a/blockdev.c b/blockdev.c index 32b04b4..ab6eaea 100644 --- a/blockdev.c +++ b/blockdev.c @@ -539,10 +539,6 @@ static BlockBackend *blockdev_init(const char *file, QDict *bs_opts, bdrv_flags |= BDRV_O_COPY_ON_READ; } - if (runstate_check(RUN_STATE_INMIGRATE)) { - bdrv_flags |= BDRV_O_INCOMING; - } - bdrv_flags |= ro ? 0 : BDRV_O_RDWR; blk = blk_new_open(qemu_opts_id(opts), file, NULL, bs_opts, bdrv_flags,
This flag should not be set for the root BDS only, but for any BDS that is being created while incoming migration is pending, so setting it is moved from blockdev_init() to bdrv_fill_options(). Signed-off-by: Max Reitz <mreitz@redhat.com> --- block.c | 4 ++++ blockdev.c | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-)