All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jason Wang <jasowang@redhat.com>
To: qemu-devel@nongnu.org, peter.maydell@linaro.org
Cc: Zhang Chen <chen.zhang@intel.com>, "Rao, Lei" <lei.rao@intel.com>,
	Lukas Straub <lukasstraub2@web.de>,
	Jason Wang <jasowang@redhat.com>,
	Li Zhijian <lizhijian@fujitsu.com>
Subject: [PULL 06/12] Remove some duplicate trace code.
Date: Fri, 11 Jun 2021 14:00:18 +0800	[thread overview]
Message-ID: <20210611060024.46763-7-jasowang@redhat.com> (raw)
In-Reply-To: <20210611060024.46763-1-jasowang@redhat.com>

From: "Rao, Lei" <lei.rao@intel.com>

There is the same trace code in the colo_compare_packet_payload.

Signed-off-by: Lei Rao <lei.rao@intel.com>
Reviewed-by: Li Zhijian <lizhijian@fujitsu.com>
Reviewed-by: Zhang Chen <chen.zhang@intel.com>
Reviewed-by: Lukas Straub <lukasstraub2@web.de>
Tested-by: Lukas Straub <lukasstraub2@web.de>
Signed-off-by: Zhang Chen <chen.zhang@intel.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 net/colo-compare.c | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/net/colo-compare.c b/net/colo-compare.c
index 9d1ad99..c142c08 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -590,19 +590,6 @@ static int colo_packet_compare_other(Packet *spkt, Packet *ppkt)
     uint16_t offset = ppkt->vnet_hdr_len;
 
     trace_colo_compare_main("compare other");
-    if (trace_event_get_state_backends(TRACE_COLO_COMPARE_IP_INFO)) {
-        char pri_ip_src[20], pri_ip_dst[20], sec_ip_src[20], sec_ip_dst[20];
-
-        strcpy(pri_ip_src, inet_ntoa(ppkt->ip->ip_src));
-        strcpy(pri_ip_dst, inet_ntoa(ppkt->ip->ip_dst));
-        strcpy(sec_ip_src, inet_ntoa(spkt->ip->ip_src));
-        strcpy(sec_ip_dst, inet_ntoa(spkt->ip->ip_dst));
-
-        trace_colo_compare_ip_info(ppkt->size, pri_ip_src,
-                                   pri_ip_dst, spkt->size,
-                                   sec_ip_src, sec_ip_dst);
-    }
-
     if (ppkt->size != spkt->size) {
         trace_colo_compare_main("Other: payload size of packets are different");
         return -1;
-- 
2.7.4



  parent reply	other threads:[~2021-06-11  6:07 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-11  6:00 [PULL 00/12] Net patches Jason Wang
2021-06-11  6:00 ` [PULL 01/12] vhost-vdpa: skip ram device from the IOTLB mapping Jason Wang
2021-06-11  6:00 ` [PULL 02/12] vhost-vdpa: map virtqueue notification area if possible Jason Wang
2021-06-11  6:00 ` [PULL 03/12] vhost-vdpa: don't initialize backend_features Jason Wang
2021-06-11  6:00 ` [PULL 04/12] vhost-vdpa: remove the unused vhost_vdpa_get_acked_features() Jason Wang
2021-06-11  6:00 ` [PULL 05/12] netdev: add more commands to preconfig mode Jason Wang
2021-06-11  6:00 ` Jason Wang [this message]
2021-06-11  6:00 ` [PULL 07/12] Fix the qemu crash when guest shutdown during checkpoint Jason Wang
2021-06-11  6:00 ` [PULL 08/12] Optimize the function of filter_send Jason Wang
2021-06-11  6:00 ` [PULL 09/12] Remove migrate_set_block_enabled in checkpoint Jason Wang
2021-06-11  6:00 ` [PULL 10/12] Add a function named packet_new_nocopy for COLO Jason Wang
2021-06-11  6:00 ` [PULL 11/12] Add the function of colo_compare_cleanup Jason Wang
2021-06-11  6:00 ` [PULL 12/12] Fixed calculation error of pkt->header_size in fill_pkt_tcp_info() Jason Wang
2021-06-11 12:02 ` [PULL 00/12] Net patches Peter Maydell
2021-06-14 22:43 ` no-reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210611060024.46763-7-jasowang@redhat.com \
    --to=jasowang@redhat.com \
    --cc=chen.zhang@intel.com \
    --cc=lei.rao@intel.com \
    --cc=lizhijian@fujitsu.com \
    --cc=lukasstraub2@web.de \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.