From nobody Sun Apr 28 20:35:32 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.zoho.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 14957979493611018.9920319001066; Fri, 26 May 2017 04:25:49 -0700 (PDT) Received: from localhost ([::1]:36094 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dEDNK-00014H-1P for importer@patchew.org; Fri, 26 May 2017 07:25:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43792) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dEDK3-0006J3-Gb for qemu-devel@nongnu.org; Fri, 26 May 2017 07:22:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dEDK1-0006Ob-OO for qemu-devel@nongnu.org; Fri, 26 May 2017 07:22:23 -0400 Received: from [59.151.112.132] (port=52326 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dEDK1-0006Mq-CB for qemu-devel@nongnu.org; Fri, 26 May 2017 07:22:21 -0400 Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 26 May 2017 19:22:14 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id A9B5447C6542; Fri, 26 May 2017 19:22:11 +0800 (CST) Received: from localhost.localdomain (10.167.226.56) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.319.2; Fri, 26 May 2017 19:22:11 +0800 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="19346833" From: Zhang Chen To: qemu devel , Jason Wang Date: Fri, 26 May 2017 19:22:05 +0800 Message-ID: <1495797727-16695-2-git-send-email-zhangchen.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1495797727-16695-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> References: <1495797727-16695-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.56] X-yoursite-MailScanner-ID: A9B5447C6542.AE11E X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: zhangchen.fnst@cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Subject: [Qemu-devel] [PATCH V2 1/3] COLO-compare: Add new parameter for communicate with remote colo-frame 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: zhanghailiang , Zhang Chen 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 Content-Type: text/plain; charset="utf-8" We add the "notify_dev=3DchardevID" parameter. colo-compare can connect with remote colo-frame through chardev socket, Xen colo-frame is the first user. We can notify colo-frame do checkpoint events. Signed-off-by: Zhang Chen --- net/colo-compare.c | 20 ++++++++++++++++++++ qemu-options.hx | 41 +++++++++++++++++++++++++++++++++++------ 2 files changed, 55 insertions(+), 6 deletions(-) diff --git a/net/colo-compare.c b/net/colo-compare.c index 2639c7f..6f8c439 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -68,6 +68,7 @@ typedef struct CompareState { char *pri_indev; char *sec_indev; char *outdev; + char *notify_dev; CharBackend chr_pri_in; CharBackend chr_sec_in; CharBackend chr_out; @@ -653,6 +654,21 @@ static void compare_set_outdev(Object *obj, const char= *value, Error **errp) s->outdev =3D g_strdup(value); } =20 +static char *compare_get_notify_dev(Object *obj, Error **errp) +{ + CompareState *s =3D COLO_COMPARE(obj); + + return g_strdup(s->notify_dev); +} + +static void compare_set_notify_dev(Object *obj, const char *value, Error *= *errp) +{ + CompareState *s =3D COLO_COMPARE(obj); + + g_free(s->notify_dev); + s->notify_dev =3D g_strdup(value); +} + static void compare_pri_rs_finalize(SocketReadState *pri_rs) { CompareState *s =3D container_of(pri_rs, CompareState, pri_rs); @@ -795,6 +811,9 @@ static void colo_compare_init(Object *obj) object_property_add_str(obj, "outdev", compare_get_outdev, compare_set_outdev, NULL); + object_property_add_str(obj, "notify_dev", + compare_get_notify_dev, compare_set_notify_dev, + NULL); } =20 static void colo_compare_finalize(Object *obj) @@ -819,6 +838,7 @@ static void colo_compare_finalize(Object *obj) g_free(s->pri_indev); g_free(s->sec_indev); g_free(s->outdev); + g_free(s->notify_dev); } =20 static const TypeInfo colo_compare_info =3D { diff --git a/qemu-options.hx b/qemu-options.hx index f63f7dc..1f3b3d2 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4092,23 +4092,26 @@ Dump the network traffic on netdev @var{dev} to the= file specified by The file format is libpcap, so it can be analyzed with tools such as tcpdu= mp or Wireshark. =20 -@item -object colo-compare,id=3D@var{id},primary_in=3D@var{chardevid},seco= ndary_in=3D@var{chardevid}, -outdev=3D@var{chardevid} +@item -object colo-compare,id=3D@var{id},primary_in=3D@var{chardevid},seco= ndary_in=3D@var{chardevid},outdev=3D@var{chardevid},notify_dev=3D@var{chard= evid} =20 -Colo-compare gets packet from primary_in@var{chardevid} and secondary_in@v= ar{chardevid}, than compare primary packet with -secondary packet. If the packets are same, we will output primary -packet to outdev@var{chardevid}, else we will notify colo-frame +Colo-compare gets packet from primary_in@var{chardevid} and secondary_in@v= ar{chardevid}, +than compare primary packet with secondary packet. If the packets are same, +we will output primary packet to outdev@var{chardevid},else we will notify= colo-frame do checkpoint and send primary packet to outdev@var{chardevid}. +If we use Xen COLO, will use notify_dev to notify remote colo-frame do che= ckpoint(like Xen), +at the same time send primary packet to outdev@var{chardevid}. =20 we must use it with the help of filter-mirror and filter-redirector. =20 @example =20 +KVM COLO + primary: -netdev tap,id=3Dhn0,vhost=3Doff,script=3D/etc/qemu-ifup,downscript=3D/etc= /qemu-ifdown -device e1000,id=3De0,netdev=3Dhn0,mac=3D52:a4:00:12:78:66 -chardev socket,id=3Dmirror0,host=3D3.3.3.3,port=3D9003,server,nowait --chardev socket,id=3Dcompare1,host=3D3.3.3.3,port=3D9004,server,nowait +-chardev socket,id=3Dcompare1,host=3D3.3.3.3,port=3D9004,server,wait -chardev socket,id=3Dcompare0,host=3D3.3.3.3,port=3D9001,server,nowait -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 @@ -4126,6 +4129,32 @@ secondary: -object filter-redirector,id=3Df1,netdev=3Dhn0,queue=3Dtx,indev=3Dred0 -object filter-redirector,id=3Df2,netdev=3Dhn0,queue=3Drx,outdev=3Dred1 =20 + +Xen COLO + +primary: +-netdev tap,id=3Dhn0,vhost=3Doff,script=3D/etc/qemu-ifup,downscript=3D/etc= /qemu-ifdown +-device e1000,id=3De0,netdev=3Dhn0,mac=3D52:a4:00:12:78:66 +-chardev socket,id=3Dmirror0,host=3D3.3.3.3,port=3D9003,server,nowait +-chardev socket,id=3Dcompare1,host=3D3.3.3.3,port=3D9004,server,nowait +-chardev socket,id=3Dcompare0,host=3D3.3.3.3,port=3D9001,server,nowait +-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 +-chardev socket,id=3Dnotify_way,host=3D3.3.3.3,port=3D9009,server,nowait +-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,notify_dev=3Dnofity_way + +secondary: +-netdev tap,id=3Dhn0,vhost=3Doff,script=3D/etc/qemu-ifup,down script=3D/et= c/qemu-ifdown +-device e1000,netdev=3Dhn0,mac=3D52:a4:00:12:78:66 +-chardev socket,id=3Dred0,host=3D3.3.3.3,port=3D9003 +-chardev socket,id=3Dred1,host=3D3.3.3.3,port=3D9004 +-object filter-redirector,id=3Df1,netdev=3Dhn0,queue=3Dtx,indev=3Dred0 +-object filter-redirector,id=3Df2,netdev=3Dhn0,queue=3Drx,outdev=3Dred1 + @end example =20 If you want to know the detail of above command line, you can read --=20 2.7.4 From nobody Sun Apr 28 20:35:32 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.zoho.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 1495797844607339.9846189043402; Fri, 26 May 2017 04:24:04 -0700 (PDT) Received: from localhost ([::1]:36080 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dEDLd-00083P-P3 for importer@patchew.org; Fri, 26 May 2017 07:24:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43776) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dEDK2-0006G9-Mg for qemu-devel@nongnu.org; Fri, 26 May 2017 07:22:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dEDJz-0006Ng-GT for qemu-devel@nongnu.org; Fri, 26 May 2017 07:22:22 -0400 Received: from [59.151.112.132] (port=52326 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dEDJy-0006Mq-Jl for qemu-devel@nongnu.org; Fri, 26 May 2017 07:22:19 -0400 Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 26 May 2017 19:22:14 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id 782FE47C655B; Fri, 26 May 2017 19:22:12 +0800 (CST) Received: from localhost.localdomain (10.167.226.56) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.319.2; Fri, 26 May 2017 19:22:12 +0800 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="19346834" From: Zhang Chen To: qemu devel , Jason Wang Date: Fri, 26 May 2017 19:22:06 +0800 Message-ID: <1495797727-16695-3-git-send-email-zhangchen.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1495797727-16695-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> References: <1495797727-16695-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.56] X-yoursite-MailScanner-ID: 782FE47C655B.AFAFF X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: zhangchen.fnst@cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Subject: [Qemu-devel] [PATCH V2 2/3] COLO-compare: Add remote checkpoint notify chardev socket handler frame 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: zhanghailiang , Zhang Chen 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 Content-Type: text/plain; charset="utf-8" Add chardev handler to get remote colo-frame's notify, Xen colo is the firs= t user. Signed-off-by: Zhang Chen --- net/colo-compare.c | 41 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/net/colo-compare.c b/net/colo-compare.c index 6f8c439..c968597 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -72,8 +72,10 @@ typedef struct CompareState { CharBackend chr_pri_in; CharBackend chr_sec_in; CharBackend chr_out; + CharBackend chr_notify_dev; SocketReadState pri_rs; SocketReadState sec_rs; + SocketReadState notify_rs; =20 /* connection list: the connections belonged to this NIC could be found * in this list. @@ -567,6 +569,19 @@ static void compare_sec_chr_in(void *opaque, const uin= t8_t *buf, int size) } } =20 +static void compare_notify_chr(void *opaque, const uint8_t *buf, int size) +{ + CompareState *s =3D COLO_COMPARE(opaque); + int ret; + + ret =3D net_fill_rstate(&s->notify_rs, buf, size); + if (ret =3D=3D -1) { + qemu_chr_fe_set_handlers(&s->chr_notify_dev, NULL, NULL, NULL, + NULL, NULL, true); + error_report("colo-compare notify_dev error"); + } +} + /* * Check old packet regularly so it can watch for any packets * that the secondary hasn't produced equivalents of. @@ -589,9 +604,11 @@ static void *colo_compare_thread(void *opaque) s->worker_context =3D g_main_context_new(); =20 qemu_chr_fe_set_handlers(&s->chr_pri_in, compare_chr_can_read, - compare_pri_chr_in, NULL, s, s->worker_context, = true); + compare_pri_chr_in, NULL, s, s->worker_contex= t, true); qemu_chr_fe_set_handlers(&s->chr_sec_in, compare_chr_can_read, - compare_sec_chr_in, NULL, s, s->worker_context, = true); + compare_sec_chr_in, NULL, s, s->worker_contex= t, true); + qemu_chr_fe_set_handlers(&s->chr_notify_dev, compare_chr_can_read, + compare_notify_chr, NULL, s, s->worker_contex= t, true); =20 s->compare_loop =3D g_main_loop_new(s->worker_context, FALSE); =20 @@ -694,6 +711,10 @@ static void compare_sec_rs_finalize(SocketReadState *s= ec_rs) } } =20 +static void compare_notify_rs_finalize(SocketReadState *notify_rs) +{ + /* Get remote colo-frame's notify and handle the message */ +} =20 /* * Return 0 is success. @@ -757,6 +778,15 @@ static void colo_compare_complete(UserCreatable *uc, E= rror **errp) return; } =20 + /* This parameter is Optional, Remote checkpoint notify need it */ + if (s->notify_dev) { + if (find_and_check_chardev(&chr, s->notify_dev, errp) || + !qemu_chr_fe_init(&s->chr_notify_dev, chr, errp)) { + return; + } + net_socket_rs_init(&s->notify_dev, compare_notify_rs_finalize); + } + net_socket_rs_init(&s->pri_rs, compare_pri_rs_finalize); net_socket_rs_init(&s->sec_rs, compare_sec_rs_finalize); =20 @@ -825,6 +855,7 @@ static void colo_compare_finalize(Object *obj) qemu_chr_fe_set_handlers(&s->chr_sec_in, NULL, NULL, NULL, NULL, s->worker_context, true); qemu_chr_fe_deinit(&s->chr_out); + qemu_chr_fe_deinit(&s->chr_notify_dev); =20 g_main_loop_quit(s->compare_loop); qemu_thread_join(&s->thread); @@ -838,7 +869,11 @@ static void colo_compare_finalize(Object *obj) g_free(s->pri_indev); g_free(s->sec_indev); g_free(s->outdev); - g_free(s->notify_dev); + + /* This parameter is Optional */ + if (s->notify_dev) { + g_free(s->notify_dev); + } } =20 static const TypeInfo colo_compare_info =3D { --=20 2.7.4 From nobody Sun Apr 28 20:35:32 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.zoho.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 1495797861611254.78839443563777; Fri, 26 May 2017 04:24:21 -0700 (PDT) Received: from localhost ([::1]:36082 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dEDLv-0008KE-4Y for importer@patchew.org; Fri, 26 May 2017 07:24:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43775) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dEDK2-0006G7-Mg for qemu-devel@nongnu.org; Fri, 26 May 2017 07:22:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dEDK0-0006O5-KM for qemu-devel@nongnu.org; Fri, 26 May 2017 07:22:22 -0400 Received: from [59.151.112.132] (port=52326 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dEDK0-0006Mq-86 for qemu-devel@nongnu.org; Fri, 26 May 2017 07:22:20 -0400 Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 26 May 2017 19:22:14 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id 2BE4647C655C; Fri, 26 May 2017 19:22:13 +0800 (CST) Received: from localhost.localdomain (10.167.226.56) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.319.2; Fri, 26 May 2017 19:22:13 +0800 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="19346832" From: Zhang Chen To: qemu devel , Jason Wang Date: Fri, 26 May 2017 19:22:07 +0800 Message-ID: <1495797727-16695-4-git-send-email-zhangchen.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1495797727-16695-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> References: <1495797727-16695-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.56] X-yoursite-MailScanner-ID: 2BE4647C655C.AF8D8 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: zhangchen.fnst@cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Subject: [Qemu-devel] [PATCH V2 3/3] COLO-compare: Add remote initialization and checkpoint notification 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: zhanghailiang , Zhang Chen 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 Content-Type: text/plain; charset="utf-8" Initialize remote communication socket and make a handshack with remote col= o-frame. Then use this way to notify remote colo-frame do checkpoint. Signed-off-by: Zhang Chen --- net/colo-compare.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/net/colo-compare.c b/net/colo-compare.c index c968597..34e31e1 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -100,6 +100,12 @@ enum { SECONDARY_IN, }; =20 +typedef enum ProxyRemoteRequest { + USERSPACE_PROXY_INIT =3D 0, + USERSPACE_PROXY_GET_REMOTE_INIT =3D 1, + USERSPACE_PROXY_NOTIFY_CHECKPOINT =3D 2 +} ProxyRemoteRequest; + static int compare_chr_send(CharBackend *out, const uint8_t *buf, uint32_t size); @@ -498,6 +504,18 @@ static void colo_compare_connection(void *opaque, void= *user_data) trace_colo_compare_main("packet different"); g_queue_push_tail(&conn->primary_list, pkt); /* TODO: colo_notify_checkpoint();*/ + /* + * If we have notify_dev that means COLO didn't running on KVM, + * So we use remote checkpoint notify, Xen is the first user. + */ + if (s->notify_dev) { + ProxyRemoteRequest msg =3D USERSPACE_PROXY_NOTIFY_CHECKPOI= NT; + ret =3D compare_chr_send(&s->chr_notify_dev, (uint8_t *)ms= g, + sizeof(msg)); + if (ret < 0) { + error_report("Notify remote COLO-frame failed"); + } + } break; } } @@ -713,7 +731,21 @@ static void compare_sec_rs_finalize(SocketReadState *s= ec_rs) =20 static void compare_notify_rs_finalize(SocketReadState *notify_rs) { + CompareState *s =3D container_of(notify_rs, CompareState, notify_rs); + /* Get remote colo-frame's notify and handle the message */ + char *data =3D g_memdup(notify_rs->buf, notify_rs->packet_len); + ProxyRemoteRequest msg =3D USERSPACE_PROXY_GET_REMOTE_INIT; + ProxyRemoteRequest msg_recv =3D *data; + int ret; + + if (msg_recv =3D=3D USERSPACE_PROXY_INIT) { + ret =3D compare_chr_send(&s->chr_notify_dev, (uint8_t *)msg, + sizeof(msg)); + if (ret < 0) { + error_report("Notify remote COLO-frame INIT failed"); + } + } } =20 /* @@ -784,7 +816,7 @@ static void colo_compare_complete(UserCreatable *uc, Er= ror **errp) !qemu_chr_fe_init(&s->chr_notify_dev, chr, errp)) { return; } - net_socket_rs_init(&s->notify_dev, compare_notify_rs_finalize); + net_socket_rs_init(&s->notify_rs, compare_notify_rs_finalize); } =20 net_socket_rs_init(&s->pri_rs, compare_pri_rs_finalize); --=20 2.7.4