Re: [Qemu-devel] [PATCH] net/colo-compare.c: Remove duplicated code

[Philippe Mathieu-Daudé]

On 1/14/19 3:30 PM, Thomas Huth wrote:
> On 2019-01-14 15:05, Zhang Chen wrote:
>> From: Zhang Chen <address@hidden>
>>
>> Fix duplicated code:
>> https://bugs.launchpad.net/qemu/+bug/1811499
>>

Fixes: f449c9e549c

>> Signed-off-by: Zhang Chen <address@hidden>
>> ---
>>  net/colo-compare.c | 8 --------
>>  1 file changed, 8 deletions(-)
>>
>> diff --git a/net/colo-compare.c b/net/colo-compare.c
>> index 9156ab3349..fa3fd0632d 100644
>> --- a/net/colo-compare.c
>> +++ b/net/colo-compare.c
>> @@ -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,
>>
> 
> Reviewed-by: Thomas Huth <address@hidden>

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>