From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43746) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cjNSd-0007tV-22 for qemu-devel@nongnu.org; Thu, 02 Mar 2017 04:55:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cjNSZ-0003YN-Uf for qemu-devel@nongnu.org; Thu, 02 Mar 2017 04:55:47 -0500 Received: from [59.151.112.132] (port=32331 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cjNSZ-0003XR-H4 for qemu-devel@nongnu.org; Thu, 02 Mar 2017 04:55:43 -0500 From: Zhang Chen Date: Thu, 2 Mar 2017 17:54:18 +0800 Message-ID: <1488448458-4976-4-git-send-email-zhangchen.fnst@cn.fujitsu.com> In-Reply-To: <1488448458-4976-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> References: <1488448458-4976-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH V3 3/3] COLO-compare: Fix icmp and udp compare different packet always dump bug List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu devel , Jason Wang Cc: Zhang Chen , zhanghailiang , "eddie . dong" , bian naimeng , Li Zhijian Signed-off-by: Zhang Chen --- net/colo-compare.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/net/colo-compare.c b/net/colo-compare.c index 9f5968d..282727b 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -279,9 +279,13 @@ static int colo_packet_compare_udp(Packet *spkt, Packet *ppkt) if (ret) { trace_colo_compare_udp_miscompare("primary pkt size", ppkt->size); - qemu_hexdump((char *)ppkt->data, stderr, "colo-compare", ppkt->size); trace_colo_compare_udp_miscompare("Secondary pkt size", spkt->size); - qemu_hexdump((char *)spkt->data, stderr, "colo-compare", spkt->size); + if (trace_event_get_state(TRACE_COLO_COMPARE_MISCOMPARE)) { + qemu_hexdump((char *)ppkt->data, stderr, "colo-compare pri pkt", + ppkt->size); + qemu_hexdump((char *)spkt->data, stderr, "colo-compare sec pkt", + spkt->size); + } } return ret; @@ -311,12 +315,14 @@ static int colo_packet_compare_icmp(Packet *spkt, Packet *ppkt) network_header_length + ETH_HLEN)) { trace_colo_compare_icmp_miscompare("primary pkt size", ppkt->size); - qemu_hexdump((char *)ppkt->data, stderr, "colo-compare", - ppkt->size); trace_colo_compare_icmp_miscompare("Secondary pkt size", spkt->size); - qemu_hexdump((char *)spkt->data, stderr, "colo-compare", - spkt->size); + if (trace_event_get_state(TRACE_COLO_COMPARE_MISCOMPARE)) { + qemu_hexdump((char *)ppkt->data, stderr, "colo-compare pri pkt", + ppkt->size); + qemu_hexdump((char *)spkt->data, stderr, "colo-compare sec pkt", + spkt->size); + } return -1; } else { return 0; -- 2.7.4