| Message ID | 1698263069-406971-4-git-send-email-steven.sistare@oracle.com |
|---|---|
| State | New |
| Headers | show |
| Series | Live Update reboot mode | expand |
Copy qemu-block and maintainers. On Wed, Oct 25, 2023 at 12:44:26PM -0700, Steve Sistare wrote: > Some blockdevs block migration because they do not support sharing across > hosts and/or do not support dirty bitmaps. These prohibitions do not apply > if the old and new qemu processes do not run concurrently, and if new qemu > starts on the same host as old, which is the case for cpr. Narrow the scope > of these blockers so they only apply to normal mode. They will not block > cpr modes when they are added in subsequent patches. > > No functional change until a new mode is added. > > Signed-off-by: Steve Sistare <steven.sistare@oracle.com> > Reviewed-by: Juan Quintela <quintela@redhat.com> > --- > block/parallels.c | 2 +- > block/qcow.c | 2 +- > block/vdi.c | 2 +- > block/vhdx.c | 2 +- > block/vmdk.c | 2 +- > block/vpc.c | 2 +- > block/vvfat.c | 2 +- > 7 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/block/parallels.c b/block/parallels.c > index 1697a2e..8a520db 100644 > --- a/block/parallels.c > +++ b/block/parallels.c > @@ -1369,7 +1369,7 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags, > bdrv_get_device_or_node_name(bs)); > bdrv_graph_rdunlock_main_loop(); > > - ret = migrate_add_blocker(&s->migration_blocker, errp); > + ret = migrate_add_blocker_normal(&s->migration_blocker, errp); > if (ret < 0) { > error_setg(errp, "Migration blocker error"); > goto fail; > diff --git a/block/qcow.c b/block/qcow.c > index fdd4c83..eab68e3 100644 > --- a/block/qcow.c > +++ b/block/qcow.c > @@ -307,7 +307,7 @@ static int qcow_open(BlockDriverState *bs, QDict *options, int flags, > bdrv_get_device_or_node_name(bs)); > bdrv_graph_rdunlock_main_loop(); > > - ret = migrate_add_blocker(&s->migration_blocker, errp); > + ret = migrate_add_blocker_normal(&s->migration_blocker, errp); > if (ret < 0) { > goto fail; > } > diff --git a/block/vdi.c b/block/vdi.c > index fd7e365..c647d72 100644 > --- a/block/vdi.c > +++ b/block/vdi.c > @@ -498,7 +498,7 @@ static int vdi_open(BlockDriverState *bs, QDict *options, int flags, > bdrv_get_device_or_node_name(bs)); > bdrv_graph_rdunlock_main_loop(); > > - ret = migrate_add_blocker(&s->migration_blocker, errp); > + ret = migrate_add_blocker_normal(&s->migration_blocker, errp); > if (ret < 0) { > goto fail_free_bmap; > } > diff --git a/block/vhdx.c b/block/vhdx.c > index e37f8c0..a9d0874 100644 > --- a/block/vhdx.c > +++ b/block/vhdx.c > @@ -1096,7 +1096,7 @@ static int vhdx_open(BlockDriverState *bs, QDict *options, int flags, > error_setg(&s->migration_blocker, "The vhdx format used by node '%s' " > "does not support live migration", > bdrv_get_device_or_node_name(bs)); > - ret = migrate_add_blocker(&s->migration_blocker, errp); > + ret = migrate_add_blocker_normal(&s->migration_blocker, errp); > if (ret < 0) { > goto fail; > } > diff --git a/block/vmdk.c b/block/vmdk.c > index 1335d39..85864b8 100644 > --- a/block/vmdk.c > +++ b/block/vmdk.c > @@ -1386,7 +1386,7 @@ static int vmdk_open(BlockDriverState *bs, QDict *options, int flags, > error_setg(&s->migration_blocker, "The vmdk format used by node '%s' " > "does not support live migration", > bdrv_get_device_or_node_name(bs)); > - ret = migrate_add_blocker(&s->migration_blocker, errp); > + ret = migrate_add_blocker_normal(&s->migration_blocker, errp); > if (ret < 0) { > goto fail; > } > diff --git a/block/vpc.c b/block/vpc.c > index c30cf86..aa1a48a 100644 > --- a/block/vpc.c > +++ b/block/vpc.c > @@ -452,7 +452,7 @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags, > bdrv_get_device_or_node_name(bs)); > bdrv_graph_rdunlock_main_loop(); > > - ret = migrate_add_blocker(&s->migration_blocker, errp); > + ret = migrate_add_blocker_normal(&s->migration_blocker, errp); > if (ret < 0) { > goto fail; > } > diff --git a/block/vvfat.c b/block/vvfat.c > index 266e036..9d050ba 100644 > --- a/block/vvfat.c > +++ b/block/vvfat.c > @@ -1268,7 +1268,7 @@ static int vvfat_open(BlockDriverState *bs, QDict *options, int flags, > "The vvfat (rw) format used by node '%s' " > "does not support live migration", > bdrv_get_device_or_node_name(bs)); > - ret = migrate_add_blocker(&s->migration_blocker, errp); > + ret = migrate_add_blocker_normal(&s->migration_blocker, errp); > if (ret < 0) { > goto fail; > } > -- > 1.8.3.1 >
diff --git a/block/parallels.c b/block/parallels.c index 1697a2e..8a520db 100644 --- a/block/parallels.c +++ b/block/parallels.c @@ -1369,7 +1369,7 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags, bdrv_get_device_or_node_name(bs)); bdrv_graph_rdunlock_main_loop(); - ret = migrate_add_blocker(&s->migration_blocker, errp); + ret = migrate_add_blocker_normal(&s->migration_blocker, errp); if (ret < 0) { error_setg(errp, "Migration blocker error"); goto fail; diff --git a/block/qcow.c b/block/qcow.c index fdd4c83..eab68e3 100644 --- a/block/qcow.c +++ b/block/qcow.c @@ -307,7 +307,7 @@ static int qcow_open(BlockDriverState *bs, QDict *options, int flags, bdrv_get_device_or_node_name(bs)); bdrv_graph_rdunlock_main_loop(); - ret = migrate_add_blocker(&s->migration_blocker, errp); + ret = migrate_add_blocker_normal(&s->migration_blocker, errp); if (ret < 0) { goto fail; } diff --git a/block/vdi.c b/block/vdi.c index fd7e365..c647d72 100644 --- a/block/vdi.c +++ b/block/vdi.c @@ -498,7 +498,7 @@ static int vdi_open(BlockDriverState *bs, QDict *options, int flags, bdrv_get_device_or_node_name(bs)); bdrv_graph_rdunlock_main_loop(); - ret = migrate_add_blocker(&s->migration_blocker, errp); + ret = migrate_add_blocker_normal(&s->migration_blocker, errp); if (ret < 0) { goto fail_free_bmap; } diff --git a/block/vhdx.c b/block/vhdx.c index e37f8c0..a9d0874 100644 --- a/block/vhdx.c +++ b/block/vhdx.c @@ -1096,7 +1096,7 @@ static int vhdx_open(BlockDriverState *bs, QDict *options, int flags, error_setg(&s->migration_blocker, "The vhdx format used by node '%s' " "does not support live migration", bdrv_get_device_or_node_name(bs)); - ret = migrate_add_blocker(&s->migration_blocker, errp); + ret = migrate_add_blocker_normal(&s->migration_blocker, errp); if (ret < 0) { goto fail; } diff --git a/block/vmdk.c b/block/vmdk.c index 1335d39..85864b8 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -1386,7 +1386,7 @@ static int vmdk_open(BlockDriverState *bs, QDict *options, int flags, error_setg(&s->migration_blocker, "The vmdk format used by node '%s' " "does not support live migration", bdrv_get_device_or_node_name(bs)); - ret = migrate_add_blocker(&s->migration_blocker, errp); + ret = migrate_add_blocker_normal(&s->migration_blocker, errp); if (ret < 0) { goto fail; } diff --git a/block/vpc.c b/block/vpc.c index c30cf86..aa1a48a 100644 --- a/block/vpc.c +++ b/block/vpc.c @@ -452,7 +452,7 @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags, bdrv_get_device_or_node_name(bs)); bdrv_graph_rdunlock_main_loop(); - ret = migrate_add_blocker(&s->migration_blocker, errp); + ret = migrate_add_blocker_normal(&s->migration_blocker, errp); if (ret < 0) { goto fail; } diff --git a/block/vvfat.c b/block/vvfat.c index 266e036..9d050ba 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -1268,7 +1268,7 @@ static int vvfat_open(BlockDriverState *bs, QDict *options, int flags, "The vvfat (rw) format used by node '%s' " "does not support live migration", bdrv_get_device_or_node_name(bs)); - ret = migrate_add_blocker(&s->migration_blocker, errp); + ret = migrate_add_blocker_normal(&s->migration_blocker, errp); if (ret < 0) { goto fail; }