summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLukas Straub2020-05-22 09:53:51 +0200
committerJason Wang2020-06-18 15:05:52 +0200
commit5893c7383e6e16e3e6b24b0551501721f3309d9e (patch)
treed10facfa4037a8642c39a1ec0d0e9ed6156b6108 /net
parentnet: use peer when purging queue in qemu_flush_or_purge_queue_packets() (diff)
downloadqemu-5893c7383e6e16e3e6b24b0551501721f3309d9e.tar.gz
qemu-5893c7383e6e16e3e6b24b0551501721f3309d9e.tar.xz
qemu-5893c7383e6e16e3e6b24b0551501721f3309d9e.zip
net/colo-compare.c: Create event_bh with the right AioContext
qemu_bh_new will set the bh to be executed in the main loop. This causes crashes as colo_compare_handle_event assumes that it has exclusive access the queues, which are also concurrently accessed in the iothread. Create the bh with the AioContext of the iothread to fulfill these assumptions and fix the crashes. This is safe, because the bh already takes the appropriate locks. Signed-off-by: Lukas Straub <lukasstraub2@web.de> Reviewed-by: Zhang Chen <chen.zhang@intel.com> Reviewed-by: Derek Su <dereksu@qnap.com> Tested-by: Derek Su <dereksu@qnap.com> Signed-off-by: Zhang Chen <chen.zhang@intel.com> Signed-off-by: Jason Wang <jasowang@redhat.com>
Diffstat (limited to 'net')
-rw-r--r--net/colo-compare.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/colo-compare.c b/net/colo-compare.c
index c07e7c1c09..e557da70e5 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -890,6 +890,7 @@ static void colo_compare_handle_event(void *opaque)
static void colo_compare_iothread(CompareState *s)
{
+ AioContext *ctx = iothread_get_aio_context(s->iothread);
object_ref(OBJECT(s->iothread));
s->worker_context = iothread_get_g_main_context(s->iothread);
@@ -906,7 +907,7 @@ static void colo_compare_iothread(CompareState *s)
}
colo_compare_timer_init(s);
- s->event_bh = qemu_bh_new(colo_compare_handle_event, s);
+ s->event_bh = aio_bh_new(ctx, colo_compare_handle_event, s);
}
static char *compare_get_pri_indev(Object *obj, Error **errp)