From 8164102ffe02dfc6478c0b3f8ffce29705a9a53b Mon Sep 17 00:00:00 2001 From: Vladimir Sementsov-Ogievskiy Date: Thu, 6 Jun 2019 18:41:31 +0300 Subject: blockdev: blockdev_mark_auto_del: drop usage of bs->job We are going to remove bs->job pointer. Drop it's usage in blockdev_mark_auto_del: instead of looking at bs->job let's check all jobs for references to bs. Suggested-by: Kevin Wolf Signed-off-by: Vladimir Sementsov-Ogievskiy Signed-off-by: Kevin Wolf --- blockjob.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'blockjob.c') diff --git a/blockjob.c b/blockjob.c index 1fac6bb8a7..c3620ec544 100644 --- a/blockjob.c +++ b/blockjob.c @@ -198,6 +198,20 @@ void block_job_remove_all_bdrv(BlockJob *job) job->nodes = NULL; } +bool block_job_has_bdrv(BlockJob *job, BlockDriverState *bs) +{ + GSList *el; + + for (el = job->nodes; el; el = el->next) { + BdrvChild *c = el->data; + if (c->bs == bs) { + return true; + } + } + + return false; +} + int block_job_add_bdrv(BlockJob *job, const char *name, BlockDriverState *bs, uint64_t perm, uint64_t shared_perm, Error **errp) { -- cgit v1.2.3