@@ -4189,7 +4189,7 @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
goto error;
}
- if (drv->bdrv_reopen_prepare) {
+ if (drv->bdrv_reopen_prepare || drv->is_filter) {
/*
* If a driver-specific option is missing, it means that we
* should reset it to its default value.
@@ -4201,16 +4201,19 @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
goto error;
}
- ret = drv->bdrv_reopen_prepare(reopen_state, queue, &local_err);
- if (ret) {
- if (local_err != NULL) {
- error_propagate(errp, local_err);
- } else {
- bdrv_refresh_filename(reopen_state->bs);
- error_setg(errp, "failed while preparing to reopen image '%s'",
- reopen_state->bs->filename);
+ if (drv->bdrv_reopen_prepare) {
+ ret = drv->bdrv_reopen_prepare(reopen_state, queue, &local_err);
+ if (ret) {
+ if (local_err != NULL) {
+ error_propagate(errp, local_err);
+ } else {
+ bdrv_refresh_filename(reopen_state->bs);
+ error_setg(errp,
+ "failed while preparing to reopen image '%s'",
+ reopen_state->bs->filename);
+ }
+ goto error;
}
- goto error;
}
} else {
/* It is currently mandatory to have a bdrv_reopen_prepare()
@@ -524,9 +524,8 @@ class TestBlockdevReopen(iotests.QMPTestCase):
result = self.vm.qmp('blockdev-add', conv_keys = False, **bvopts)
self.assert_qmp(result, 'return', {})
- # blkverify doesn't currently allow reopening. TODO: implement this
- self.reopen(bvopts, {}, "Block format 'blkverify' used by node 'bv'" +
- " does not support reopening files")
+ # blkverify allows reopening
+ self.reopen(bvopts, {})
# Illegal: hd0 is a child of the blkverify node
self.reopen(opts[0], {'backing': 'bv'},
We are going to drop inherits_from logic, so every child will be recursively reopened including filters. Let's assume that by default filters do nothing on reopen prepare. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> --- block.c | 23 +++++++++++++---------- tests/qemu-iotests/245 | 5 ++--- 2 files changed, 15 insertions(+), 13 deletions(-)