diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2017-06-05 14:39:07 +0200 |
|---|---|---|
| committer | Fam Zheng <famz@redhat.com> | 2017-06-16 07:55:00 +0800 |
| commit | 9caa6f3dbe20f2c506df6698386fce941fc6238a (patch) | |
| tree | 0d2cceb60dbfe4f1d01cef4c23f69edbabcd7dac | |
| parent | 39c1b4254e6200519d747f6cb8c888004e2446e2 (diff) | |
block: split BlockAcctStats creation and setup
block_acct_destroy is called unconditionally in blk_delete, but there is
no BlockAcctStats function that is called unconditionally in blk_new.
Split block_acct_init in two, so that it will be possible to create a
QemuMutex in block_acct_init and destroy it in block_acct_cleanup.
Cc: Alberto Garcia <berto@igalia.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20170605123908.18777-19-pbonzini@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
| -rw-r--r-- | block/accounting.c | 13 | ||||
| -rw-r--r-- | block/block-backend.c | 1 | ||||
| -rw-r--r-- | blockdev.c | 2 | ||||
| -rw-r--r-- | include/block/accounting.h | 3 |
4 files changed, 12 insertions, 7 deletions
diff --git a/block/accounting.c b/block/accounting.c index a279e0b124..ce6dbf7760 100644 --- a/block/accounting.c +++ b/block/accounting.c @@ -32,17 +32,20 @@ static QEMUClockType clock_type = QEMU_CLOCK_REALTIME; static const int qtest_latency_ns = NANOSECONDS_PER_SECOND / 1000; -void block_acct_init(BlockAcctStats *stats, bool account_invalid, - bool account_failed) +void block_acct_init(BlockAcctStats *stats) { - stats->account_invalid = account_invalid; - stats->account_failed = account_failed; - if (qtest_enabled()) { clock_type = QEMU_CLOCK_VIRTUAL; } } +void block_acct_setup(BlockAcctStats *stats, bool account_invalid, + bool account_failed) +{ + stats->account_invalid = account_invalid; + stats->account_failed = account_failed; +} + void block_acct_cleanup(BlockAcctStats *stats) { BlockAcctTimedStats *s, *next; diff --git a/block/block-backend.c b/block/block-backend.c index 738882dd2e..a2bbae90b1 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -219,6 +219,7 @@ BlockBackend *blk_new(uint64_t perm, uint64_t shared_perm) qemu_co_mutex_init(&blk->public.throttled_reqs_lock); qemu_co_queue_init(&blk->public.throttled_reqs[0]); qemu_co_queue_init(&blk->public.throttled_reqs[1]); + block_acct_init(&blk->stats); notifier_list_init(&blk->remove_bs_notifiers); notifier_list_init(&blk->insert_bs_notifiers); diff --git a/blockdev.c b/blockdev.c index 39f289ba68..39d6b9712b 100644 --- a/blockdev.c +++ b/blockdev.c @@ -595,7 +595,7 @@ static BlockBackend *blockdev_init(const char *file, QDict *bs_opts, autostart = 0; } - block_acct_init(blk_get_stats(blk), account_invalid, account_failed); + block_acct_setup(blk_get_stats(blk), account_invalid, account_failed); if (!parse_stats_intervals(blk_get_stats(blk), interval_list, errp)) { blk_unref(blk); diff --git a/include/block/accounting.h b/include/block/accounting.h index 20891639d5..55cb06fdb6 100644 --- a/include/block/accounting.h +++ b/include/block/accounting.h @@ -61,7 +61,8 @@ typedef struct BlockAcctCookie { enum BlockAcctType type; } BlockAcctCookie; -void block_acct_init(BlockAcctStats *stats, bool account_invalid, +void block_acct_init(BlockAcctStats *stats); +void block_acct_setup(BlockAcctStats *stats, bool account_invalid, bool account_failed); void block_acct_cleanup(BlockAcctStats *stats); void block_acct_add_interval(BlockAcctStats *stats, unsigned interval_length); |