[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/6] blkdebug: Factor out remove_rule()
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 2/6] blkdebug: Factor out remove_rule() |
Date: |
Thu, 6 Dec 2012 14:32:56 +0100 |
The cleanup work to remove a rule depends on the type of the rule. It's
easy for the existing rules as there is no data that must be cleaned up
and is specific to a type yet, but the next patch will change this.
Signed-off-by: Kevin Wolf <address@hidden>
---
block/blkdebug.c | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/block/blkdebug.c b/block/blkdebug.c
index c9041ec..859792b 100644
--- a/block/blkdebug.c
+++ b/block/blkdebug.c
@@ -234,6 +234,18 @@ static int add_rule(QemuOpts *opts, void *opaque)
return 0;
}
+static void remove_rule(BlkdebugRule *rule)
+{
+ switch (rule->action) {
+ case ACTION_INJECT_ERROR:
+ case ACTION_SET_STATE:
+ break;
+ }
+
+ QLIST_REMOVE(rule, next);
+ g_free(rule);
+}
+
static int read_config(BDRVBlkdebugState *s, const char *filename)
{
FILE *f;
@@ -402,8 +414,7 @@ static void blkdebug_close(BlockDriverState *bs)
for (i = 0; i < BLKDBG_EVENT_MAX; i++) {
QLIST_FOREACH_SAFE(rule, &s->rules[i], next, next) {
- QLIST_REMOVE(rule, next);
- g_free(rule);
+ remove_rule(rule);
}
}
}
--
1.7.6.5
- [Qemu-devel] [PATCH 0/6] blkdebug/qcow2/qemu-iotests: Add some AIO testing, Kevin Wolf, 2012/12/06
- [Qemu-devel] [PATCH 4/6] qemu-io: Add AIO debugging commands, Kevin Wolf, 2012/12/06
- [Qemu-devel] [PATCH 2/6] blkdebug: Factor out remove_rule(),
Kevin Wolf <=
- [Qemu-devel] [PATCH 1/6] blkdebug: Allow usage without config file, Kevin Wolf, 2012/12/06
- [Qemu-devel] [PATCH 6/6] qemu-iotests: Test concurrent cluster allocations, Kevin Wolf, 2012/12/06
- [Qemu-devel] [PATCH 5/6] qcow2: Move BLKDBG_EVENT out of the lock, Kevin Wolf, 2012/12/06
- [Qemu-devel] [PATCH 3/6] blkdebug: Implement suspend/resume of AIO requests, Kevin Wolf, 2012/12/06