From 7496699ba63b8690fbd38b232ee41da25fc9d8d7 Mon Sep 17 00:00:00 2001 From: Manos Pitsidianakis Date: Mon, 18 Sep 2017 23:25:29 +0300 Subject: block/throttle-groups.c: allocate RestartData on the heap RestartData is the opaque data of the throttle_group_restart_queue_entry coroutine. By being stack allocated, it isn't available anymore if aio_co_enter schedules the coroutine with a bottom half and runs after throttle_group_restart_queue returns. Cc: qemu-stable@nongnu.org Signed-off-by: Manos Pitsidianakis Reviewed-by: Eric Blake Reviewed-by: Alberto Garcia Signed-off-by: Kevin Wolf (cherry picked from commit 43a5dc02fd6070827d5c4ff652b885219fa8cbe1) Conflicts: block/throttle-groups.c * reworked to avoid functional dep on 022cdc9, since that involves refactoring for a feature not present in 2.10 Signed-off-by: Michael Roth --- block/throttle-groups.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/block/throttle-groups.c b/block/throttle-groups.c index 890bfded3f..8f5b445eff 100644 --- a/block/throttle-groups.c +++ b/block/throttle-groups.c @@ -392,17 +392,19 @@ static void coroutine_fn throttle_group_restart_queue_entry(void *opaque) schedule_next_request(blk, is_write); qemu_mutex_unlock(&tg->lock); } + + g_free(data); } static void throttle_group_restart_queue(BlockBackend *blk, bool is_write) { Coroutine *co; - RestartData rd = { - .blk = blk, - .is_write = is_write - }; + RestartData *rd = g_new0(RestartData, 1); + + rd->blk = blk; + rd->is_write = is_write; - co = qemu_coroutine_create(throttle_group_restart_queue_entry, &rd); + co = qemu_coroutine_create(throttle_group_restart_queue_entry, rd); aio_co_enter(blk_get_aio_context(blk), co); } -- cgit v1.2.1