yannick.naumann/RT-Task-Generator-QEMU
1
0
Fork 0
forked from alwin.berger/FRET-qemu
Code Pull Requests Activity

block/blkdebug: remove new_state field and instead use a local variable

Browse Source 
There seems to be no benefit in using a field. Replace it with a local
variable, and move the state update before the yields.

The state update has do be done before the yields because now using
a local variable does not allow the new updated state to be visible
by the other yields.

Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Message-Id: <20210614082931.24925-6-eesposit@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Emanuele Giuseppe Esposito 2021-06-14 10:29:30 +02:00 committed by Max Reitz
parent 2196c341f7
commit 4153b553bd
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
block/blkdebug.c
View File

@ -40,7 +40,6 @@
typedef struct BDRVBlkdebugState { typedef struct BDRVBlkdebugState {
int state; int state;
int new_state;
uint64_t align; uint64_t align;
uint64_t max_transfer; uint64_t max_transfer;
uint64_t opt_write_zero; uint64_t opt_write_zero;
@ -792,7 +791,7 @@ static void suspend_request(BlockDriverState *bs, BlkdebugRule *rule)
} }
static void process_rule(BlockDriverState *bs, struct BlkdebugRule *rule, static void process_rule(BlockDriverState *bs, struct BlkdebugRule *rule,
int *action_count) int *action_count, int *new_state)
{ {
BDRVBlkdebugState *s = bs->opaque; BDRVBlkdebugState *s = bs->opaque;
@ -812,7 +811,7 @@ static void process_rule(BlockDriverState *bs, struct BlkdebugRule *rule,
break; break;
case ACTION_SET_STATE: case ACTION_SET_STATE:
s->new_state = rule->options.set_state.new_state; *new_state = rule->options.set_state.new_state;
break; break;
case ACTION_SUSPEND: case ACTION_SUSPEND:
@ -825,21 +824,21 @@ 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;
int new_state;
int actions_count[ACTION__MAX] = { 0 }; int actions_count[ACTION__MAX] = { 0 };
assert((int)event >= 0 && event < BLKDBG__MAX); assert((int)event >= 0 && event < BLKDBG__MAX);
s->new_state = s->state; new_state = s->state;
QLIST_FOREACH_SAFE(rule, &s->rules[event], next, next) { QLIST_FOREACH_SAFE(rule, &s->rules[event], next, next) {
process_rule(bs, rule, actions_count); process_rule(bs, rule, actions_count, &new_state);
} }
s->state = new_state;
while (actions_count[ACTION_SUSPEND] > 0) { while (actions_count[ACTION_SUSPEND] > 0) {
qemu_coroutine_yield(); qemu_coroutine_yield();
actions_count[ACTION_SUSPEND]--; actions_count[ACTION_SUSPEND]--;
} }
s->state = s->new_state;
} }
static int blkdebug_debug_breakpoint(BlockDriverState *bs, const char *event, static int blkdebug_debug_breakpoint(BlockDriverState *bs, const char *event,