From: Vladimir Sementsov-Ogievskiy Date: Wed, 10 May 2023 15:06:21 +0000 (+0300) Subject: blockdev: qmp_transaction: refactor loop to classic for X-Git-Tag: v8.1.0-rc0~108^2~18 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=30c96b555974ed0341b3c374b20a26242f1de239;p=thirdparty%2Fqemu.git blockdev: qmp_transaction: refactor loop to classic for Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Kevin Wolf Message-Id: <20230510150624.310640-4-vsementsov@yandex-team.ru> Signed-off-by: Kevin Wolf --- diff --git a/blockdev.c b/blockdev.c index 75e313f4038..dd0e98bbe17 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2377,7 +2377,7 @@ void qmp_transaction(TransactionActionList *actions, struct TransactionProperties *properties, Error **errp) { - TransactionActionList *act = actions; + TransactionActionList *act; bool has_properties = !!properties; JobTxn *block_job_txn = NULL; Error *local_err = NULL; @@ -2397,14 +2397,11 @@ void qmp_transaction(TransactionActionList *actions, bdrv_drain_all(); /* We don't do anything in this loop that commits us to the operations */ - while (NULL != act) { - TransactionAction *dev_info = NULL; + for (act = actions; act; act = act->next) { + TransactionAction *dev_info = act->value; const BlkActionOps *ops; BlkActionState *state; - dev_info = act->value; - act = act->next; - assert(dev_info->type < ARRAY_SIZE(actions_map)); ops = &actions_map[dev_info->type];