From nobody Sun Apr 28 04:26:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1502967723757552.877673333128; Thu, 17 Aug 2017 04:02:03 -0700 (PDT) Received: from localhost ([::1]:44953 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1diIYs-0006Ok-Iy for importer@patchew.org; Thu, 17 Aug 2017 07:02:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40956) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1diIVh-0004E4-5i for qemu-devel@nongnu.org; Thu, 17 Aug 2017 06:58:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1diIVe-0004Ku-3q for qemu-devel@nongnu.org; Thu, 17 Aug 2017 06:58:45 -0400 Received: from mxhk.zte.com.cn ([63.217.80.70]:45040 helo=zte.com.cn) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1diIVd-0004Kd-Gm for qemu-devel@nongnu.org; Thu, 17 Aug 2017 06:58:42 -0400 Received: from unknown (HELO mse01.zte.com.cn) (10.30.3.20) by localhost with (AES256-SHA encrypted) SMTP; 17 Aug 2017 10:58:20 -0000 Received: from notes_smtp.zte.com.cn ([10.30.1.239]) by mse01.zte.com.cn with ESMTP id v7HAwC7S087961; Thu, 17 Aug 2017 18:58:12 +0800 (GMT-8) (envelope-from wang.yong155@zte.com.cn) Received: from localhost.localdomain ([10.74.120.79]) by szsmtp06.zte.com.cn (Lotus Domino Release 8.5.3FP6) with ESMTP id 2017081718581800-156420 ; Thu, 17 Aug 2017 18:58:18 +0800 X-scanvirus: By SEG_CYREN AntiVirus Engine X-scanresult: CLEAN X-MAILFROM: X-RCPTTO: X-FROMIP: 10.30.3.20 X-SEG-Scaned: 1 X-Received: unknown,10.30.3.20,20170817185820 From: Wang yong To: pbonzini@redhat.com, stefanha@redhat.com, famz@redhat.com, jasowang@redhat.com, zhangchen.fnst@cn.fujitsu.com, zhang.zhanghailiang@huawei.com Date: Thu, 17 Aug 2017 18:58:01 +0800 Message-Id: <1502967483-4090-2-git-send-email-wang.yong155@zte.com.cn> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1502967483-4090-1-git-send-email-wang.yong155@zte.com.cn> References: <1502967483-4090-1-git-send-email-wang.yong155@zte.com.cn> X-MIMETrack: Itemize by SMTP Server on SZSMTP06/server/zte_ltd(Release 8.5.3FP6|November 21, 2013) at 2017-08-17 18:58:18, Serialize by Router on notes_smtp/zte_ltd(Release 9.0.1FP7|August 17, 2016) at 2017-08-17 18:58:00, Serialize complete at 2017-08-17 18:58:00 X-MAIL: mse01.zte.com.cn v7HAwC7S087961 X-HQIP: 127.0.0.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 63.217.80.70 Subject: [Qemu-devel] [PATCHv3 01/03] qemu-iothread: IOThread supports the GMainContext event loop X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org, wang.yong155@zte.com.cn, lizhijian@cn.fujitsu.com, wang.guang55@zte.com.cn Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Wang Yong IOThread uses AioContext event loop and does not run a GMainContext. Therefore,chardev cannot work in IOThread,such as the chardev is used for colo-compare packets reception. This patch makes the IOThread run the GMainContext event loop, chardev and IOThread can work together. Signed-off-by: Wang Yong Signed-off-by: Wang Guang --- include/sysemu/iothread.h | 4 ++++ iothread.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/include/sysemu/iothread.h b/include/sysemu/iothread.h index e6da1a4..d2985b3 100644 --- a/include/sysemu/iothread.h +++ b/include/sysemu/iothread.h @@ -24,6 +24,9 @@ typedef struct { =20 QemuThread thread; AioContext *ctx; + GMainContext *worker_context; + GMainLoop *main_loop; + GOnce once; QemuMutex init_done_lock; QemuCond init_done_cond; /* is thread initialization done? */ bool stopping; @@ -41,5 +44,6 @@ typedef struct { char *iothread_get_id(IOThread *iothread); AioContext *iothread_get_aio_context(IOThread *iothread); void iothread_stop_all(void); +GMainContext *iothread_get_g_main_context(IOThread *iothread); =20 #endif /* IOTHREAD_H */ diff --git a/iothread.c b/iothread.c index beeb870..80ef830 100644 --- a/iothread.c +++ b/iothread.c @@ -57,6 +57,20 @@ static void *iothread_run(void *opaque) =20 while (!atomic_read(&iothread->stopping)) { aio_poll(iothread->ctx, true); + + if (atomic_read(&iothread->worker_context)) { + g_main_context_push_thread_default(iothread->worker_context); + iothread->main_loop =3D + g_main_loop_new(iothread->worker_context, TRUE); + g_main_loop_run(iothread->main_loop); + + g_main_loop_unref(iothread->main_loop); + iothread->main_loop =3D NULL; + + g_main_context_pop_thread_default(iothread->worker_context); + g_main_context_unref(iothread->worker_context); + iothread->worker_context =3D NULL; + } } =20 rcu_unregister_thread(); @@ -73,6 +87,9 @@ static int iothread_stop(Object *object, void *opaque) } iothread->stopping =3D true; aio_notify(iothread->ctx); + if (atomic_read(&iothread->main_loop)) { + g_main_loop_quit(iothread->main_loop); + } qemu_thread_join(&iothread->thread); return 0; } @@ -125,6 +142,7 @@ static void iothread_complete(UserCreatable *obj, Error= **errp) =20 qemu_mutex_init(&iothread->init_done_lock); qemu_cond_init(&iothread->init_done_cond); + iothread->once =3D (GOnce) G_ONCE_INIT; =20 /* This assumes we are called from a thread with useful CPU affinity f= or us * to inherit. @@ -309,3 +327,26 @@ void iothread_stop_all(void) =20 object_child_foreach(container, iothread_stop, NULL); } + +static gpointer iothread_g_main_context_init(gpointer opaque) +{ + AioContext *ctx; + IOThread *iothread =3D opaque; + GSource *source; + + iothread->worker_context =3D g_main_context_new(); + + ctx =3D iothread_get_aio_context(iothread); + source =3D aio_get_g_source(ctx); + g_source_attach(source, iothread->worker_context); + g_source_unref(source); + + return NULL; +} + +GMainContext *iothread_get_g_main_context(IOThread *iothread) +{ + g_once(&iothread->once, iothread_g_main_context_init, iothread); + + return iothread->worker_context; +} --=20 1.8.3.1 From nobody Sun Apr 28 04:26:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1502967851540418.9967879055215; Thu, 17 Aug 2017 04:04:11 -0700 (PDT) Received: from localhost ([::1]:44987 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1diIaw-0007iQ-9V for importer@patchew.org; Thu, 17 Aug 2017 07:04:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40961) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1diIVh-0004E9-6y for qemu-devel@nongnu.org; Thu, 17 Aug 2017 06:58:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1diIVe-0004LG-M5 for qemu-devel@nongnu.org; Thu, 17 Aug 2017 06:58:45 -0400 Received: from mx7.zte.com.cn ([202.103.147.169]:34586) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1diIVd-0004Kk-SH for qemu-devel@nongnu.org; Thu, 17 Aug 2017 06:58:42 -0400 Received: from unknown (HELO mse01.zte.com.cn) (10.30.3.20) by localhost with (AES256-SHA encrypted) SMTP; 17 Aug 2017 10:55:15 -0000 Received: from notes_smtp.zte.com.cn ([10.30.1.239]) by mse01.zte.com.cn with ESMTP id v7HAwDTV088030; Thu, 17 Aug 2017 18:58:13 +0800 (GMT-8) (envelope-from wang.yong155@zte.com.cn) Received: from localhost.localdomain ([10.74.120.79]) by szsmtp06.zte.com.cn (Lotus Domino Release 8.5.3FP6) with ESMTP id 2017081718581861-156422 ; Thu, 17 Aug 2017 18:58:18 +0800 X-scanvirus: By SEG_CYREN AntiVirus Engine X-scanresult: CLEAN X-MAILFROM: X-RCPTTO: X-FROMIP: 10.30.3.20 X-SEG-Scaned: 1 X-Received: unknown,10.30.3.20,20170817185515 From: Wang yong To: pbonzini@redhat.com, stefanha@redhat.com, famz@redhat.com, jasowang@redhat.com, zhangchen.fnst@cn.fujitsu.com, zhang.zhanghailiang@huawei.com Date: Thu, 17 Aug 2017 18:58:02 +0800 Message-Id: <1502967483-4090-3-git-send-email-wang.yong155@zte.com.cn> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1502967483-4090-1-git-send-email-wang.yong155@zte.com.cn> References: <1502967483-4090-1-git-send-email-wang.yong155@zte.com.cn> X-MIMETrack: Itemize by SMTP Server on SZSMTP06/server/zte_ltd(Release 8.5.3FP6|November 21, 2013) at 2017-08-17 18:58:18, Serialize by Router on notes_smtp/zte_ltd(Release 9.0.1FP7|August 17, 2016) at 2017-08-17 18:58:01, Serialize complete at 2017-08-17 18:58:01 X-MAIL: mse01.zte.com.cn v7HAwDTV088030 X-HQIP: 127.0.0.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x [fuzzy] X-Received-From: 202.103.147.169 Subject: [Qemu-devel] [PATCHv3 02/03] colo-compare: Use IOThread to Check old packet regularly and Process pactkets of the primary X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org, wang.yong155@zte.com.cn, lizhijian@cn.fujitsu.com, wang.guang55@zte.com.cn Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Wang Yong Remove the task which check old packet in the comparing thread, then use IOthread context timer to handle it. Process pactkets in the IOThread which arrived over the socket. we use iothread_get_g_main_context to create a new g_main_loop in the IOThread.then the packets from the primary and the secondary are processed in the IOThread. Finally remove the colo-compare thread using the IOThread instead. Signed-off-by: Wang Yong Signed-off-by: Wang Guang --- net/colo-compare.c | 75 ++++++++++++++++++++++++++++----------------------= ---- 1 file changed, 39 insertions(+), 36 deletions(-) diff --git a/net/colo-compare.c b/net/colo-compare.c index 5fe8e3f..69cb16e 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -29,6 +29,7 @@ #include "qemu/sockets.h" #include "qapi-visit.h" #include "net/colo.h" +#include "sysemu/iothread.h" =20 #define TYPE_COLO_COMPARE "colo-compare" #define COLO_COMPARE(obj) \ @@ -82,11 +83,10 @@ typedef struct CompareState { GQueue conn_list; /* hashtable to save connection */ GHashTable *connection_track_table; - /* compare thread, a thread for each NIC */ - QemuThread thread; =20 + IOThread *iothread; GMainContext *worker_context; - GMainLoop *compare_loop; + QEMUTimer *packet_check_timer; } CompareState; =20 typedef struct CompareClass { @@ -597,22 +597,40 @@ static void compare_sec_chr_in(void *opaque, const ui= nt8_t *buf, int size) * Check old packet regularly so it can watch for any packets * that the secondary hasn't produced equivalents of. */ -static gboolean check_old_packet_regular(void *opaque) +static void check_old_packet_regular(void *opaque) { CompareState *s =3D opaque; =20 /* if have old packet we will notify checkpoint */ colo_old_packet_check(s); + timer_mod(s->packet_check_timer, qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL)= + + REGULAR_PACKET_CHECK_MS); +} + +static void colo_compare_timer_init(CompareState *s) +{ + AioContext *ctx =3D iothread_get_aio_context(s->iothread); =20 - return TRUE; + s->packet_check_timer =3D aio_timer_new(ctx, QEMU_CLOCK_VIRTUAL, + SCALE_MS, check_old_packet_regular, + s); + timer_mod(s->packet_check_timer, qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL)= + + REGULAR_PACKET_CHECK_MS); } =20 -static void *colo_compare_thread(void *opaque) +static void colo_compare_timer_del(CompareState *s) { - CompareState *s =3D opaque; - GSource *timeout_source; + if (s->packet_check_timer) { + timer_del(s->packet_check_timer); + timer_free(s->packet_check_timer); + s->packet_check_timer =3D NULL; + } + } =20 - s->worker_context =3D g_main_context_new(); +static void colo_compare_iothread(CompareState *s) +{ + object_ref(OBJECT(s->iothread)); + s->worker_context =3D iothread_get_g_main_context(s->iothread); =20 qemu_chr_fe_set_handlers(&s->chr_pri_in, compare_chr_can_read, compare_pri_chr_in, NULL, NULL, @@ -621,20 +639,7 @@ static void *colo_compare_thread(void *opaque) compare_sec_chr_in, NULL, NULL, s, s->worker_context, true); =20 - s->compare_loop =3D g_main_loop_new(s->worker_context, FALSE); - - /* To kick any packets that the secondary doesn't match */ - timeout_source =3D g_timeout_source_new(REGULAR_PACKET_CHECK_MS); - g_source_set_callback(timeout_source, - (GSourceFunc)check_old_packet_regular, s, NULL); - g_source_attach(timeout_source, s->worker_context); - - g_main_loop_run(s->compare_loop); - - g_source_unref(timeout_source); - g_main_loop_unref(s->compare_loop); - g_main_context_unref(s->worker_context); - return NULL; + colo_compare_timer_init(s); } =20 static char *compare_get_pri_indev(Object *obj, Error **errp) @@ -759,12 +764,10 @@ static void colo_compare_complete(UserCreatable *uc, = Error **errp) { CompareState *s =3D COLO_COMPARE(uc); Chardev *chr; - char thread_name[64]; - static int compare_id; =20 - if (!s->pri_indev || !s->sec_indev || !s->outdev) { + if (!s->pri_indev || !s->sec_indev || !s->outdev || !s->iothread) { error_setg(errp, "colo compare needs 'primary_in' ," - "'secondary_in','outdev' property set"); + "'secondary_in','outdev','iothread' property set"); return; } else if (!strcmp(s->pri_indev, s->outdev) || !strcmp(s->sec_indev, s->outdev) || @@ -799,12 +802,7 @@ static void colo_compare_complete(UserCreatable *uc, E= rror **errp) g_free, connection_destroy); =20 - sprintf(thread_name, "colo-compare %d", compare_id); - qemu_thread_create(&s->thread, thread_name, - colo_compare_thread, s, - QEMU_THREAD_JOINABLE); - compare_id++; - + colo_compare_iothread(s); return; } =20 @@ -848,6 +846,10 @@ static void colo_compare_init(Object *obj) object_property_add_str(obj, "outdev", compare_get_outdev, compare_set_outdev, NULL); + object_property_add_link(obj, "iothread", TYPE_IOTHREAD, + (Object **)&s->iothread, + object_property_allow_set_link, + OBJ_PROP_LINK_UNREF_ON_RELEASE, NULL); =20 s->vnet_hdr =3D false; object_property_add_bool(obj, "vnet_hdr_support", compare_get_vnet_hdr, @@ -861,9 +863,7 @@ static void colo_compare_finalize(Object *obj) 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); - - g_main_loop_quit(s->compare_loop); - qemu_thread_join(&s->thread); + colo_compare_timer_del(s); =20 /* Release all unhandled packets after compare thead exited */ g_queue_foreach(&s->conn_list, colo_flush_packets, s); @@ -871,6 +871,9 @@ static void colo_compare_finalize(Object *obj) g_queue_clear(&s->conn_list); =20 g_hash_table_destroy(s->connection_track_table); + if (s->iothread) { + object_unref(OBJECT(s->iothread)); + } g_free(s->pri_indev); g_free(s->sec_indev); g_free(s->outdev); --=20 1.8.3.1 From nobody Sun Apr 28 04:26:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1502967612822137.46079243074985; Thu, 17 Aug 2017 04:00:12 -0700 (PDT) Received: from localhost ([::1]:44872 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1diIX4-00052L-Vw for importer@patchew.org; Thu, 17 Aug 2017 07:00:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40957) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1diIVh-0004E5-64 for qemu-devel@nongnu.org; Thu, 17 Aug 2017 06:58:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1diIVe-0004L9-HL for qemu-devel@nongnu.org; Thu, 17 Aug 2017 06:58:45 -0400 Received: from mx7.zte.com.cn ([202.103.147.169]:34578) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1diIVd-0004Kl-UM for qemu-devel@nongnu.org; Thu, 17 Aug 2017 06:58:42 -0400 Received: from unknown (HELO mse01.zte.com.cn) (10.30.3.20) by localhost with (AES256-SHA encrypted) SMTP; 17 Aug 2017 10:55:15 -0000 Received: from notes_smtp.zte.com.cn ([10.30.1.239]) by mse01.zte.com.cn with ESMTP id v7HAwDDg088093; Thu, 17 Aug 2017 18:58:13 +0800 (GMT-8) (envelope-from wang.yong155@zte.com.cn) Received: from localhost.localdomain ([10.74.120.79]) by szsmtp06.zte.com.cn (Lotus Domino Release 8.5.3FP6) with ESMTP id 2017081718581920-156424 ; Thu, 17 Aug 2017 18:58:19 +0800 X-scanvirus: By SEG_CYREN AntiVirus Engine X-scanresult: CLEAN X-MAILFROM: X-RCPTTO: X-FROMIP: 10.30.3.20 X-SEG-Scaned: 1 X-Received: unknown,10.30.3.20,20170817185515 From: Wang yong To: pbonzini@redhat.com, stefanha@redhat.com, famz@redhat.com, jasowang@redhat.com, zhangchen.fnst@cn.fujitsu.com, zhang.zhanghailiang@huawei.com Date: Thu, 17 Aug 2017 18:58:03 +0800 Message-Id: <1502967483-4090-4-git-send-email-wang.yong155@zte.com.cn> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1502967483-4090-1-git-send-email-wang.yong155@zte.com.cn> References: <1502967483-4090-1-git-send-email-wang.yong155@zte.com.cn> X-MIMETrack: Itemize by SMTP Server on SZSMTP06/server/zte_ltd(Release 8.5.3FP6|November 21, 2013) at 2017-08-17 18:58:19, Serialize by Router on notes_smtp/zte_ltd(Release 9.0.1FP7|August 17, 2016) at 2017-08-17 18:58:02, Serialize complete at 2017-08-17 18:58:02 X-MAIL: mse01.zte.com.cn v7HAwDDg088093 X-HQIP: 127.0.0.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x [fuzzy] X-Received-From: 202.103.147.169 Subject: [Qemu-devel] [PATCHv3 03/03] colo-compare: Update the COLO document to add the IOThread configuration X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org, wang.yong155@zte.com.cn, lizhijian@cn.fujitsu.com, wang.guang55@zte.com.cn Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Wang Yong Update colo-proxy.txt,add IOThread configuration. Later we have to configure IOThread,if not COLO can not work. Signed-off-by: Wang Yong Signed-off-by: Wang Guang --- docs/colo-proxy.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/colo-proxy.txt b/docs/colo-proxy.txt index c4941de..ce3f783 100644 --- a/docs/colo-proxy.txt +++ b/docs/colo-proxy.txt @@ -170,10 +170,11 @@ Primary(ip:3.3.3.3): -chardev socket,id=3Dcompare0-0,host=3D3.3.3.3,port=3D9001 -chardev socket,id=3Dcompare_out,host=3D3.3.3.3,port=3D9005,server,nowait -chardev socket,id=3Dcompare_out0,host=3D3.3.3.3,port=3D9005 +-object iothread,id=3Diothread1 -object filter-mirror,id=3Dm0,netdev=3Dhn0,queue=3Dtx,outdev=3Dmirror0 -object filter-redirector,netdev=3Dhn0,id=3Dredire0,queue=3Drx,indev=3Dcom= pare_out -object filter-redirector,netdev=3Dhn0,id=3Dredire1,queue=3Drx,outdev=3Dco= mpare0 --object colo-compare,id=3Dcomp0,primary_in=3Dcompare0-0,secondary_in=3Dcom= pare1,outdev=3Dcompare_out0 +-object colo-compare,id=3Dcomp0,primary_in=3Dcompare0-0,secondary_in=3Dcom= pare1,outdev=3Dcompare_out0,iothread=3Diothread1 =20 Secondary(ip:3.3.3.8): -netdev tap,id=3Dhn0,vhost=3Doff,script=3D/etc/qemu-ifup,down script=3D/et= c/qemu-ifdown --=20 1.8.3.1