[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 29/33] net/colo-compare.c: Correct ordering in complete and finali
From: |
Jason Wang |
Subject: |
[PULL 29/33] net/colo-compare.c: Correct ordering in complete and finalize |
Date: |
Tue, 16 Jun 2020 14:45:40 +0800 |
From: Lukas Straub <lukasstraub2@web.de>
In colo_compare_complete, insert CompareState into net_compares
only after everything has been initialized.
In colo_compare_finalize, remove CompareState from net_compares
before anything is deinitialized.
Signed-off-by: Lukas Straub <lukasstraub2@web.de>
Reviewed-by: Zhang Chen <chen.zhang@intel.com>
Signed-off-by: Zhang Chen <chen.zhang@intel.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
net/colo-compare.c | 45 +++++++++++++++++++++++----------------------
1 file changed, 23 insertions(+), 22 deletions(-)
diff --git a/net/colo-compare.c b/net/colo-compare.c
index c30dbfb..ed1f3d0 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -1283,15 +1283,6 @@ static void colo_compare_complete(UserCreatable *uc,
Error **errp)
s->vnet_hdr);
}
- qemu_mutex_lock(&colo_compare_mutex);
- if (!colo_compare_active) {
- qemu_mutex_init(&event_mtx);
- qemu_cond_init(&event_complete_cond);
- colo_compare_active = true;
- }
- QTAILQ_INSERT_TAIL(&net_compares, s, next);
- qemu_mutex_unlock(&colo_compare_mutex);
-
s->out_sendco.s = s;
s->out_sendco.chr = &s->chr_out;
s->out_sendco.notify_remote_frame = false;
@@ -1314,6 +1305,16 @@ static void colo_compare_complete(UserCreatable *uc,
Error **errp)
connection_destroy);
colo_compare_iothread(s);
+
+ qemu_mutex_lock(&colo_compare_mutex);
+ if (!colo_compare_active) {
+ qemu_mutex_init(&event_mtx);
+ qemu_cond_init(&event_complete_cond);
+ colo_compare_active = true;
+ }
+ QTAILQ_INSERT_TAIL(&net_compares, s, next);
+ qemu_mutex_unlock(&colo_compare_mutex);
+
return;
}
@@ -1382,19 +1383,6 @@ static void colo_compare_finalize(Object *obj)
CompareState *s = COLO_COMPARE(obj);
CompareState *tmp = NULL;
- qemu_chr_fe_deinit(&s->chr_pri_in, false);
- qemu_chr_fe_deinit(&s->chr_sec_in, false);
- qemu_chr_fe_deinit(&s->chr_out, false);
- if (s->notify_dev) {
- qemu_chr_fe_deinit(&s->chr_notify_dev, false);
- }
-
- if (s->iothread) {
- colo_compare_timer_del(s);
- }
-
- qemu_bh_delete(s->event_bh);
-
qemu_mutex_lock(&colo_compare_mutex);
QTAILQ_FOREACH(tmp, &net_compares, next) {
if (tmp == s) {
@@ -1409,6 +1397,19 @@ static void colo_compare_finalize(Object *obj)
}
qemu_mutex_unlock(&colo_compare_mutex);
+ qemu_chr_fe_deinit(&s->chr_pri_in, false);
+ qemu_chr_fe_deinit(&s->chr_sec_in, false);
+ qemu_chr_fe_deinit(&s->chr_out, false);
+ if (s->notify_dev) {
+ qemu_chr_fe_deinit(&s->chr_notify_dev, false);
+ }
+
+ if (s->iothread) {
+ colo_compare_timer_del(s);
+ }
+
+ qemu_bh_delete(s->event_bh);
+
AioContext *ctx = iothread_get_aio_context(s->iothread);
aio_context_acquire(ctx);
AIO_WAIT_WHILE(ctx, !s->out_sendco.done);
--
2.5.0
- [PULL 19/33] net: cadnece_gem: Update irq_read_clear field of designcfg_debug1 reg, (continued)
- [PULL 19/33] net: cadnece_gem: Update irq_read_clear field of designcfg_debug1 reg, Jason Wang, 2020/06/16
- [PULL 20/33] net: cadence_gem: Update the reset value for interrupt mask register, Jason Wang, 2020/06/16
- [PULL 22/33] net: cadence_gem: Fix RX address filtering, Jason Wang, 2020/06/16
- [PULL 21/33] net: cadence_gem: TX_LAST bit should be set by guest, Jason Wang, 2020/06/16
- [PULL 23/33] net: use peer when purging queue in qemu_flush_or_purge_queue_packets(), Jason Wang, 2020/06/16
- [PULL 24/33] net/colo-compare.c: Create event_bh with the right AioContext, Jason Wang, 2020/06/16
- [PULL 27/33] net/colo-compare.c: Only hexdump packets if tracing is enabled, Jason Wang, 2020/06/16
- [PULL 25/33] chardev/char.c: Use qemu_co_sleep_ns if in coroutine, Jason Wang, 2020/06/16
- [PULL 26/33] net/colo-compare.c: Fix deadlock in compare_chr_send, Jason Wang, 2020/06/16
- [PULL 28/33] net/colo-compare.c: Check that colo-compare is active, Jason Wang, 2020/06/16
- [PULL 29/33] net/colo-compare.c: Correct ordering in complete and finalize,
Jason Wang <=
- [PULL 30/33] colo-compare: Fix memory leak in packet_enqueue(), Jason Wang, 2020/06/16
- [PULL 31/33] hw/net/e1000e: Do not abort() on invalid PSRCTL register value, Jason Wang, 2020/06/16
- [PULL 33/33] net: Drop the NetLegacy structure, always use Netdev instead, Jason Wang, 2020/06/16
- [PULL 32/33] net: Drop the legacy "name" parameter from the -net option, Jason Wang, 2020/06/16
- Re: [PULL 00/33] Net patches, Peter Maydell, 2020/06/16