block: rename bdrv_invalidate_cache_all, blk_invalidate_cache and test_sync_op_invalidate_cache
Following the bdrv_activate renaming, change also the name of the respective callers. bdrv_invalidate_cache_all -> bdrv_activate_all blk_invalidate_cache -> blk_activate test_sync_op_invalidate_cache -> test_sync_op_activate No functional change intended. Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Hanna Reitz <hreitz@redhat.com> Message-Id: <20220209105452.1694545-5-eesposit@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
a94750d956
commit
3b71719462
2
block.c
2
block.c
|
@ -6473,7 +6473,7 @@ int coroutine_fn bdrv_co_invalidate_cache(BlockDriverState *bs, Error **errp)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void bdrv_invalidate_cache_all(Error **errp)
|
void bdrv_activate_all(Error **errp)
|
||||||
{
|
{
|
||||||
BlockDriverState *bs;
|
BlockDriverState *bs;
|
||||||
BdrvNextIterator it;
|
BdrvNextIterator it;
|
||||||
|
|
|
@ -1880,7 +1880,7 @@ void blk_set_enable_write_cache(BlockBackend *blk, bool wce)
|
||||||
blk->enable_write_cache = wce;
|
blk->enable_write_cache = wce;
|
||||||
}
|
}
|
||||||
|
|
||||||
void blk_invalidate_cache(BlockBackend *blk, Error **errp)
|
void blk_activate(BlockBackend *blk, Error **errp)
|
||||||
{
|
{
|
||||||
BlockDriverState *bs = blk_bs(blk);
|
BlockDriverState *bs = blk_bs(blk);
|
||||||
|
|
||||||
|
|
|
@ -1023,7 +1023,7 @@ static void postload_update_cb(void *opaque, bool running, RunState state)
|
||||||
{
|
{
|
||||||
PFlashCFI01 *pfl = opaque;
|
PFlashCFI01 *pfl = opaque;
|
||||||
|
|
||||||
/* This is called after bdrv_invalidate_cache_all. */
|
/* This is called after bdrv_activate_all. */
|
||||||
qemu_del_vm_change_state_handler(pfl->vmstate);
|
qemu_del_vm_change_state_handler(pfl->vmstate);
|
||||||
pfl->vmstate = NULL;
|
pfl->vmstate = NULL;
|
||||||
|
|
||||||
|
|
|
@ -219,7 +219,7 @@ static void postload_update_cb(void *opaque, bool running, RunState state)
|
||||||
{
|
{
|
||||||
SpaprNvram *nvram = opaque;
|
SpaprNvram *nvram = opaque;
|
||||||
|
|
||||||
/* This is called after bdrv_invalidate_cache_all. */
|
/* This is called after bdrv_activate_all. */
|
||||||
|
|
||||||
qemu_del_vm_change_state_handler(nvram->vmstate);
|
qemu_del_vm_change_state_handler(nvram->vmstate);
|
||||||
nvram->vmstate = NULL;
|
nvram->vmstate = NULL;
|
||||||
|
|
|
@ -493,8 +493,8 @@ int bdrv_co_ioctl(BlockDriverState *bs, int req, void *buf);
|
||||||
/* Invalidate any cached metadata used by image formats */
|
/* Invalidate any cached metadata used by image formats */
|
||||||
int generated_co_wrapper bdrv_invalidate_cache(BlockDriverState *bs,
|
int generated_co_wrapper bdrv_invalidate_cache(BlockDriverState *bs,
|
||||||
Error **errp);
|
Error **errp);
|
||||||
void bdrv_invalidate_cache_all(Error **errp);
|
|
||||||
int bdrv_activate(BlockDriverState *bs, Error **errp);
|
int bdrv_activate(BlockDriverState *bs, Error **errp);
|
||||||
|
void bdrv_activate_all(Error **errp);
|
||||||
int bdrv_inactivate_all(void);
|
int bdrv_inactivate_all(void);
|
||||||
|
|
||||||
/* Ensure contents are flushed to disk. */
|
/* Ensure contents are flushed to disk. */
|
||||||
|
|
|
@ -206,7 +206,7 @@ bool blk_is_writable(BlockBackend *blk);
|
||||||
bool blk_is_sg(BlockBackend *blk);
|
bool blk_is_sg(BlockBackend *blk);
|
||||||
bool blk_enable_write_cache(BlockBackend *blk);
|
bool blk_enable_write_cache(BlockBackend *blk);
|
||||||
void blk_set_enable_write_cache(BlockBackend *blk, bool wce);
|
void blk_set_enable_write_cache(BlockBackend *blk, bool wce);
|
||||||
void blk_invalidate_cache(BlockBackend *blk, Error **errp);
|
void blk_activate(BlockBackend *blk, Error **errp);
|
||||||
bool blk_is_inserted(BlockBackend *blk);
|
bool blk_is_inserted(BlockBackend *blk);
|
||||||
bool blk_is_available(BlockBackend *blk);
|
bool blk_is_available(BlockBackend *blk);
|
||||||
void blk_lock_medium(BlockBackend *blk, bool locked);
|
void blk_lock_medium(BlockBackend *blk, bool locked);
|
||||||
|
|
|
@ -932,7 +932,7 @@ static int block_load(QEMUFile *f, void *opaque, int version_id)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
blk_invalidate_cache(blk, &local_err);
|
blk_activate(blk, &local_err);
|
||||||
if (local_err) {
|
if (local_err) {
|
||||||
error_report_err(local_err);
|
error_report_err(local_err);
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
|
@ -503,9 +503,9 @@ static void process_incoming_migration_bh(void *opaque)
|
||||||
if (!migrate_late_block_activate() ||
|
if (!migrate_late_block_activate() ||
|
||||||
(autostart && (!global_state_received() ||
|
(autostart && (!global_state_received() ||
|
||||||
global_state_get_runstate() == RUN_STATE_RUNNING))) {
|
global_state_get_runstate() == RUN_STATE_RUNNING))) {
|
||||||
/* Make sure all file formats flush their mutable metadata.
|
/* Make sure all file formats throw away their mutable metadata.
|
||||||
* If we get an error here, just don't restart the VM yet. */
|
* If we get an error here, just don't restart the VM yet. */
|
||||||
bdrv_invalidate_cache_all(&local_err);
|
bdrv_activate_all(&local_err);
|
||||||
if (local_err) {
|
if (local_err) {
|
||||||
error_report_err(local_err);
|
error_report_err(local_err);
|
||||||
local_err = NULL;
|
local_err = NULL;
|
||||||
|
@ -591,8 +591,8 @@ static void process_incoming_migration_co(void *opaque)
|
||||||
|
|
||||||
/* we get COLO info, and know if we are in COLO mode */
|
/* we get COLO info, and know if we are in COLO mode */
|
||||||
if (!ret && migration_incoming_colo_enabled()) {
|
if (!ret && migration_incoming_colo_enabled()) {
|
||||||
/* Make sure all file formats flush their mutable metadata */
|
/* Make sure all file formats throw away their mutable metadata */
|
||||||
bdrv_invalidate_cache_all(&local_err);
|
bdrv_activate_all(&local_err);
|
||||||
if (local_err) {
|
if (local_err) {
|
||||||
error_report_err(local_err);
|
error_report_err(local_err);
|
||||||
goto fail;
|
goto fail;
|
||||||
|
@ -1932,7 +1932,7 @@ static void migrate_fd_cancel(MigrationState *s)
|
||||||
if (s->state == MIGRATION_STATUS_CANCELLING && s->block_inactive) {
|
if (s->state == MIGRATION_STATUS_CANCELLING && s->block_inactive) {
|
||||||
Error *local_err = NULL;
|
Error *local_err = NULL;
|
||||||
|
|
||||||
bdrv_invalidate_cache_all(&local_err);
|
bdrv_activate_all(&local_err);
|
||||||
if (local_err) {
|
if (local_err) {
|
||||||
error_report_err(local_err);
|
error_report_err(local_err);
|
||||||
} else {
|
} else {
|
||||||
|
@ -3111,7 +3111,7 @@ fail:
|
||||||
*/
|
*/
|
||||||
Error *local_err = NULL;
|
Error *local_err = NULL;
|
||||||
|
|
||||||
bdrv_invalidate_cache_all(&local_err);
|
bdrv_activate_all(&local_err);
|
||||||
if (local_err) {
|
if (local_err) {
|
||||||
error_report_err(local_err);
|
error_report_err(local_err);
|
||||||
}
|
}
|
||||||
|
@ -3256,7 +3256,7 @@ fail_invalidate:
|
||||||
Error *local_err = NULL;
|
Error *local_err = NULL;
|
||||||
|
|
||||||
qemu_mutex_lock_iothread();
|
qemu_mutex_lock_iothread();
|
||||||
bdrv_invalidate_cache_all(&local_err);
|
bdrv_activate_all(&local_err);
|
||||||
if (local_err) {
|
if (local_err) {
|
||||||
error_report_err(local_err);
|
error_report_err(local_err);
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -1438,7 +1438,7 @@ int qemu_savevm_state_complete_precopy_non_iterable(QEMUFile *f,
|
||||||
|
|
||||||
if (inactivate_disks) {
|
if (inactivate_disks) {
|
||||||
/* Inactivate before sending QEMU_VM_EOF so that the
|
/* Inactivate before sending QEMU_VM_EOF so that the
|
||||||
* bdrv_invalidate_cache_all() on the other end won't fail. */
|
* bdrv_activate_all() on the other end won't fail. */
|
||||||
ret = bdrv_inactivate_all();
|
ret = bdrv_inactivate_all();
|
||||||
if (ret) {
|
if (ret) {
|
||||||
error_report("%s: bdrv_inactivate_all() failed (%d)",
|
error_report("%s: bdrv_inactivate_all() failed (%d)",
|
||||||
|
@ -2013,9 +2013,9 @@ static void loadvm_postcopy_handle_run_bh(void *opaque)
|
||||||
|
|
||||||
trace_loadvm_postcopy_handle_run_bh("after announce");
|
trace_loadvm_postcopy_handle_run_bh("after announce");
|
||||||
|
|
||||||
/* Make sure all file formats flush their mutable metadata.
|
/* Make sure all file formats throw away their mutable metadata.
|
||||||
* If we get an error here, just don't restart the VM yet. */
|
* If we get an error here, just don't restart the VM yet. */
|
||||||
bdrv_invalidate_cache_all(&local_err);
|
bdrv_activate_all(&local_err);
|
||||||
if (local_err) {
|
if (local_err) {
|
||||||
error_report_err(local_err);
|
error_report_err(local_err);
|
||||||
local_err = NULL;
|
local_err = NULL;
|
||||||
|
|
|
@ -144,7 +144,7 @@ void qmp_cont(Error **errp)
|
||||||
* If there are no inactive block nodes (e.g. because the VM was just
|
* If there are no inactive block nodes (e.g. because the VM was just
|
||||||
* paused rather than completing a migration), bdrv_inactivate_all() simply
|
* paused rather than completing a migration), bdrv_inactivate_all() simply
|
||||||
* doesn't do anything. */
|
* doesn't do anything. */
|
||||||
bdrv_invalidate_cache_all(&local_err);
|
bdrv_activate_all(&local_err);
|
||||||
if (local_err) {
|
if (local_err) {
|
||||||
error_propagate(errp, local_err);
|
error_propagate(errp, local_err);
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -279,7 +279,7 @@ static void test_sync_op_check(BdrvChild *c)
|
||||||
g_assert_cmpint(ret, ==, -ENOTSUP);
|
g_assert_cmpint(ret, ==, -ENOTSUP);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void test_sync_op_invalidate_cache(BdrvChild *c)
|
static void test_sync_op_activate(BdrvChild *c)
|
||||||
{
|
{
|
||||||
/* Early success: Image is not inactive */
|
/* Early success: Image is not inactive */
|
||||||
bdrv_activate(c->bs, NULL);
|
bdrv_activate(c->bs, NULL);
|
||||||
|
@ -325,8 +325,8 @@ const SyncOpTest sync_op_tests[] = {
|
||||||
.name = "/sync-op/check",
|
.name = "/sync-op/check",
|
||||||
.fn = test_sync_op_check,
|
.fn = test_sync_op_check,
|
||||||
}, {
|
}, {
|
||||||
.name = "/sync-op/invalidate_cache",
|
.name = "/sync-op/activate",
|
||||||
.fn = test_sync_op_invalidate_cache,
|
.fn = test_sync_op_activate,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue