From: Zhang Chen <chen.zhang@intel.com >
To: Jason Wang <jasowang@redhat.com>, qemu-dev <qemu-devel@nongnu.org>
Cc: "Derek Su" <dereksu@qnap.com>,
"Zhang Chen" <chen.zhang@intel.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Li Zhijian" <lizhijian@cn.fujitsu.com>,
"Zhang Chen" <zhangckid@gmail.com>
Subject: [PATCH V2 06/10] colo-compare: check mark in mutual exclusion
Date: Fri, 16 Oct 2020 13:52:04 +0800 [thread overview]
Message-ID: <20201016055208.7969-7-chen.zhang@intel.com> (raw)
In-Reply-To: <20201016055208.7969-1-chen.zhang@intel.com>
From: Li Zhijian <lizhijian@cn.fujitsu.com>
Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>
Signed-off-by: Zhang Chen <chen.zhang@intel.com>
Reviewed-by: Zhang Chen <chen.zhang@intel.com>
---
net/colo-compare.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/net/colo-compare.c b/net/colo-compare.c
index a35c10fb59..8d476bbd99 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -477,13 +477,11 @@ sec:
colo_release_primary_pkt(s, ppkt);
g_queue_push_head(&conn->secondary_list, spkt);
goto pri;
- }
- if (mark == COLO_COMPARE_FREE_SECONDARY) {
+ } else if (mark == COLO_COMPARE_FREE_SECONDARY) {
conn->compare_seq = spkt->seq_end;
packet_destroy(spkt, NULL);
goto sec;
- }
- if (mark == (COLO_COMPARE_FREE_PRIMARY | COLO_COMPARE_FREE_SECONDARY)) {
+ } else if (mark == (COLO_COMPARE_FREE_PRIMARY | COLO_COMPARE_FREE_SECONDARY)) {
conn->compare_seq = ppkt->seq_end;
colo_release_primary_pkt(s, ppkt);
packet_destroy(spkt, NULL);
--
2.17.1
next prev parent reply other threads:[~2020-10-16 5:58 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-16 5:51 [PATCH V2 00/10] COLO project queued patches 20-Oct Zhang Chen
2020-10-16 5:51 ` [PATCH V2 01/10] net/filter-rewriter: destroy g_hash_table in colo_rewriter_cleanup Zhang Chen
2020-10-16 5:52 ` [PATCH V2 02/10] Optimize seq_sorter function for colo-compare Zhang Chen
2020-10-16 5:52 ` [PATCH V2 03/10] Reduce the time of checkpoint for COLO Zhang Chen
2020-10-16 5:52 ` [PATCH V2 04/10] Fix the qemu crash when guest shutdown in COLO mode Zhang Chen
2020-10-16 5:52 ` [PATCH V2 05/10] colo-compare: fix missing compare_seq initialization Zhang Chen
2020-10-16 5:52 ` Zhang Chen [this message]
2020-10-16 5:52 ` [PATCH V2 07/10] net/colo-compare.c: Fix compare_timeout format issue Zhang Chen
2020-10-16 5:52 ` [PATCH V2 08/10] net/colo-compare.c: Change the timer clock type Zhang Chen
2020-10-16 5:52 ` [PATCH V2 09/10] net/colo-compare.c: Add secondary old packet detection Zhang Chen
2020-10-16 5:52 ` [PATCH V2 10/10] net/colo-compare.c: Increase default queued packet scan frequency Zhang Chen
2020-10-19 6:52 ` [PATCH V2 00/10] COLO project queued patches 20-Oct Jason Wang
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=20201016055208.7969-7-chen.zhang@intel.com \
--to=chen.zhang@intel.com \
--cc=dereksu@qnap.com \
--cc=jasowang@redhat.com \
--cc=lizhijian@cn.fujitsu.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=zhangckid@gmail.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).