blkdebug: track all actions

Add a counter for each action that a rule can trigger.
This is mainly used to keep track of how many coroutine_yield()
we need to perform after processing all rules in the list.

Co-developed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20210614082931.24925-4-eesposit@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Emanuele Giuseppe Esposito 2021-06-14 10:29:28 +02:00 committed by Max Reitz
parent f48ff5af13
commit 51a463680d

View file

@ -74,6 +74,7 @@ enum {
ACTION_INJECT_ERROR, ACTION_INJECT_ERROR,
ACTION_SET_STATE, ACTION_SET_STATE,
ACTION_SUSPEND, ACTION_SUSPEND,
ACTION__MAX,
}; };
typedef struct BlkdebugRule { typedef struct BlkdebugRule {
@ -791,22 +792,22 @@ static void suspend_request(BlockDriverState *bs, BlkdebugRule *rule)
qemu_coroutine_yield(); qemu_coroutine_yield();
} }
static bool process_rule(BlockDriverState *bs, struct BlkdebugRule *rule, static void process_rule(BlockDriverState *bs, struct BlkdebugRule *rule,
bool injected) int *action_count)
{ {
BDRVBlkdebugState *s = bs->opaque; BDRVBlkdebugState *s = bs->opaque;
/* Only process rules for the current state */ /* Only process rules for the current state */
if (rule->state && rule->state != s->state) { if (rule->state && rule->state != s->state) {
return injected; return;
} }
/* Take the action */ /* Take the action */
action_count[rule->action]++;
switch (rule->action) { switch (rule->action) {
case ACTION_INJECT_ERROR: case ACTION_INJECT_ERROR:
if (!injected) { if (action_count[ACTION_INJECT_ERROR] == 1) {
QSIMPLEQ_INIT(&s->active_rules); QSIMPLEQ_INIT(&s->active_rules);
injected = true;
} }
QSIMPLEQ_INSERT_HEAD(&s->active_rules, rule, active_next); QSIMPLEQ_INSERT_HEAD(&s->active_rules, rule, active_next);
break; break;
@ -819,21 +820,19 @@ static bool process_rule(BlockDriverState *bs, struct BlkdebugRule *rule,
suspend_request(bs, rule); suspend_request(bs, rule);
break; break;
} }
return injected;
} }
static void blkdebug_debug_event(BlockDriverState *bs, BlkdebugEvent event) static void blkdebug_debug_event(BlockDriverState *bs, BlkdebugEvent event)
{ {
BDRVBlkdebugState *s = bs->opaque; BDRVBlkdebugState *s = bs->opaque;
struct BlkdebugRule *rule, *next; struct BlkdebugRule *rule, *next;
bool injected; int actions_count[ACTION__MAX] = { 0 };
assert((int)event >= 0 && event < BLKDBG__MAX); assert((int)event >= 0 && event < BLKDBG__MAX);
injected = false;
s->new_state = s->state; s->new_state = s->state;
QLIST_FOREACH_SAFE(rule, &s->rules[event], next, next) { QLIST_FOREACH_SAFE(rule, &s->rules[event], next, next) {
injected = process_rule(bs, rule, injected); process_rule(bs, rule, actions_count);
} }
s->state = s->new_state; s->state = s->new_state;
} }