net/colo-compare.c: Remove duplicated code
PATCH 1/1 net/colo-compare.c: Remove duplicated code
From: Zhang Chen <[email protected]>
Fix duplicated code:
https://bugs.launchpad.net/qemu/+bug/1811499
Signed-off-by Zhang Chen <[email protected]>
--- net/colo-compare.c | 8 -------- 1 file changed, 8 deletions(-)
net/colo-compare.c +0 -8
@@ -285,14 +285,6 @@ static bool colo_mark_tcp_pkt(Packet *ppkt, Packet *spkt, { *mark =0 ; -if (ppkt->tcp_seq == spkt->tcp_seq && ppkt->seq_end == spkt->seq_end) { -if (colo_compare_packet_payload (ppkt, spkt, - ppkt->header_size, spkt->header_size, - ppkt->payload_size)) { - *mark =COLO_COMPARE_FREE_SECONDARY |COLO_COMPARE_FREE_PRIMARY ; -return true; - } - }if (ppkt->tcp_seq == spkt->tcp_seq && ppkt->seq_end == spkt->seq_end) { if (colo_compare_packet_payload(ppkt, spkt, ppkt->header_size, spkt->header_size,
Signature · 1 line
2.17.GIT
Quoted 20 lines · Zhang Chen
From: Zhang Chen <[email protected]>
Fix duplicated code:
https://bugs.launchpad.net/qemu/+bug/1811499Signed-off-by Zhang Chen <[email protected]>--- net/colo-compare.c | 8 -------- 1 file changed, 8 deletions(-)net/colo-compare.c +0
-1@@ -285,14 +285,6 @@ static bool colo_mark_tcp_pkt(Packet *ppkt, Packet *spkt, { *mark =0 ; -if (ppkt->tcp_seq == spkt->tcp_seq && ppkt->seq_end == spkt->seq_end) {
net/colo-compare.c static bool colo_mark_tcp_pkt(Packet *ppkt, Packet *spkt, · line 290
Quoted 10 lines
net/colo-compare.c +0
-7-if (colo_compare_packet_payload (ppkt, spkt, - ppkt->header_size, spkt->header_size, - ppkt->payload_size)) { - *mark =COLO_COMPARE_FREE_SECONDARY |COLO_COMPARE_FREE_PRIMARY ; -return true; - } - }if (ppkt->tcp_seq == spkt->tcp_seq && ppkt->seq_end == spkt->seq_end) { if (colo_compare_packet_payload(ppkt, spkt, ppkt->header_size, spkt->header_size,
Reviewed-by Thomas Huth <[email protected]>
Philippe Mathieu-Daudé
Reviewed-byQuoted 6 lines · Thomas Huth
Quoted 5 lines · Zhang Chen
From: Zhang Chen <[email protected]>
Fix duplicated code:
https://bugs.launchpad.net/qemu/+bug/1811499
Fixes f449c9e549c
Quoted 13 lines
Quoted 13 lines
Signed-off-by Zhang Chen <[email protected]>--- net/colo-compare.c | 8 -------- 1 file changed, 8 deletions(-)net/colo-compare.c +0
-0@@ -285,14 +285,6 @@ static bool colo_mark_tcp_pkt(Packet *ppkt, Packet *spkt, { *mark =0 ;
Quoted 14 lines
net/colo-compare.c static bool colo_mark_tcp_pkt(Packet *ppkt, Packet *spkt, · line 290
Quoted 12 lines
net/colo-compare.c +0
-8-if (ppkt->tcp_seq == spkt->tcp_seq && ppkt->seq_end == spkt->seq_end) { -if (colo_compare_packet_payload (ppkt, spkt, - ppkt->header_size, spkt->header_size, - ppkt->payload_size)) { - *mark =COLO_COMPARE_FREE_SECONDARY |COLO_COMPARE_FREE_PRIMARY ; -return true; - } - }if (ppkt->tcp_seq == spkt->tcp_seq && ppkt->seq_end == spkt->seq_end) { if (colo_compare_packet_payload(ppkt, spkt, ppkt->header_size, spkt->header_size,Reviewed-by Thomas Huth <[email protected]>
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Jason Wang
AppliedQuoted 35 lines · Philippe Mathieu-Daudé
Quoted 6 lines · Thomas Huth
Quoted 5 lines · Zhang Chen
From: Zhang Chen <[email protected]>
Fix duplicated code:
https://bugs.launchpad.net/qemu/+bug/1811499Fixes f449c9e549cQuoted 13 lines
Quoted 13 lines
Signed-off-by Zhang Chen <[email protected]>--- net/colo-compare.c | 8 -------- 1 file changed, 8 deletions(-)net/colo-compare.c +0
-0@@ -285,14 +285,6 @@ static bool colo_mark_tcp_pkt(Packet *ppkt, Packet *spkt, { *mark =0 ;Quoted 13 lines
net/colo-compare.c static bool colo_mark_tcp_pkt(Packet *ppkt, Packet *spkt, · line 290
Quoted 12 lines
net/colo-compare.c +0
-8-if (ppkt->tcp_seq == spkt->tcp_seq && ppkt->seq_end == spkt->seq_end) { -if (colo_compare_packet_payload (ppkt, spkt, - ppkt->header_size, spkt->header_size, - ppkt->payload_size)) { - *mark =COLO_COMPARE_FREE_SECONDARY |COLO_COMPARE_FREE_PRIMARY ; -return true; - } - }if (ppkt->tcp_seq == spkt->tcp_seq && ppkt->seq_end == spkt->seq_end) { if (colo_compare_packet_payload(ppkt, spkt, ppkt->header_size, spkt->header_size,Reviewed-by Thomas Huth <[email protected]>
Quoted 2 lines
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Applied.
Thanks