All of lore.kernel.org
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH] net/colo-compare.c: Remove duplicated code
@ 2019-01-14 14:05 Zhang Chen
  2019-01-14 14:30 ` Thomas Huth
  0 siblings, 1 reply; 4+ messages in thread
From: Zhang Chen @ 2019-01-14 14:05 UTC (permalink / raw)
  To: Li Zhijian, Zhang Chen, Thomas Huth, Jason Wang, qemu-dev; +Cc: Zhang Chen

From: Zhang Chen <chen.zhang@intel.com>

Fix duplicated code:
https://bugs.launchpad.net/qemu/+bug/1811499

Signed-off-by: Zhang Chen <chen.zhang@intel.com>
---
 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,
-- 
2.17.GIT

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] net/colo-compare.c: Remove duplicated code
  2019-01-14 14:05 [Qemu-devel] [PATCH] net/colo-compare.c: Remove duplicated code Zhang Chen
@ 2019-01-14 14:30 ` Thomas Huth
  2019-01-14 16:44   ` Philippe Mathieu-Daudé
  0 siblings, 1 reply; 4+ messages in thread
From: Thomas Huth @ 2019-01-14 14:30 UTC (permalink / raw)
  To: Zhang Chen, Li Zhijian, Zhang Chen, Jason Wang, qemu-dev

On 2019-01-14 15:05, Zhang Chen wrote:
> From: Zhang Chen <chen.zhang@intel.com>
> 
> Fix duplicated code:
> https://bugs.launchpad.net/qemu/+bug/1811499
> 
> Signed-off-by: Zhang Chen <chen.zhang@intel.com>
> ---
>  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 <thuth@redhat.com>

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] net/colo-compare.c: Remove duplicated code
  2019-01-14 14:30 ` Thomas Huth
@ 2019-01-14 16:44   ` Philippe Mathieu-Daudé
  2019-01-15  8:06     ` Jason Wang
  0 siblings, 1 reply; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-01-14 16:44 UTC (permalink / raw)
  To: Thomas Huth, Zhang Chen, Li Zhijian, Zhang Chen, Jason Wang, qemu-dev

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

Fixes: f449c9e549c

>> Signed-off-by: Zhang Chen <chen.zhang@intel.com>
>> ---
>>  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 <thuth@redhat.com>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] net/colo-compare.c: Remove duplicated code
  2019-01-14 16:44   ` Philippe Mathieu-Daudé
@ 2019-01-15  8:06     ` Jason Wang
  0 siblings, 0 replies; 4+ messages in thread
From: Jason Wang @ 2019-01-15  8:06 UTC (permalink / raw)
  To: Philippe Mathieu-Daudé,
	Thomas Huth, Zhang Chen, Li Zhijian, Zhang Chen, qemu-dev


On 2019/1/15 上午12:44, Philippe Mathieu-Daudé wrote:
> On 1/14/19 3:30 PM, Thomas Huth wrote:
>> On 2019-01-14 15:05, Zhang Chen wrote:
>>> From: Zhang Chen <chen.zhang@intel.com>
>>>
>>> Fix duplicated code:
>>> https://bugs.launchpad.net/qemu/+bug/1811499
>>>
> Fixes: f449c9e549c
>
>>> Signed-off-by: Zhang Chen <chen.zhang@intel.com>
>>> ---
>>>   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 <thuth@redhat.com>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>

Applied.

Thanks

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-01-15  8:06 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-14 14:05 [Qemu-devel] [PATCH] net/colo-compare.c: Remove duplicated code Zhang Chen
2019-01-14 14:30 ` Thomas Huth
2019-01-14 16:44   ` Philippe Mathieu-Daudé
2019-01-15  8:06     ` Jason Wang

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.