| Message ID | 1617263249-54501-2-git-send-email-lei.rao@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Fixed some bugs and optimized some codes for COLO | expand |
> -----Original Message----- > From: Rao, Lei <lei.rao@intel.com> > Sent: Thursday, April 1, 2021 3:47 PM > To: Zhang, Chen <chen.zhang@intel.com>; lizhijian@cn.fujitsu.com; > jasowang@redhat.com; quintela@redhat.com; dgilbert@redhat.com; > pbonzini@redhat.com; lukasstraub2@web.de > Cc: qemu-devel@nongnu.org; Rao, Lei <lei.rao@intel.com> > Subject: [PATCH v5 01/10] Remove some duplicate trace code. > > 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> Thanks Chen > --- > 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; > -- > 1.8.3.1
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;