From: Like Xu <like.xu@linux.intel.com>
To: qemu-devel@nongnu.org
Cc: Zhang Chen <chen.zhang@intel.com>,
Li Zhijian <lizhijian@cn.fujitsu.com>,
Like Xu <like.xu@linux.intel.com>
Subject: [PATCH 2/2] migration/colo/net: fix typo in the COLO Proxy module
Date: Sun, 14 Jun 2020 16:45:10 +0800 [thread overview]
Message-ID: <20200614084510.7917-2-like.xu@linux.intel.com> (raw)
In-Reply-To: <20200614084510.7917-1-like.xu@linux.intel.com>
Cc: Zhang Chen <chen.zhang@intel.com>
Cc: Li Zhijian <lizhijian@cn.fujitsu.com>
Signed-off-by: Like Xu <like.xu@linux.intel.com>
---
docs/colo-proxy.txt | 4 ++--
net/colo-compare.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/docs/colo-proxy.txt b/docs/colo-proxy.txt
index fa1cef0278..0bbd6f720a 100644
--- a/docs/colo-proxy.txt
+++ b/docs/colo-proxy.txt
@@ -21,7 +21,7 @@ and filter-rewriter compose the COLO-proxy.
== Architecture ==
COLO-Proxy is based on qemu netfilter and it's a plugin for qemu netfilter
-(except colo-compare). It keep Secondary VM connect normally to
+(except colo-compare). It keeps Secondary VM connect normally to
client and compare packets sent by PVM with sent by SVM.
If the packet difference, notify COLO-frame to do checkpoint and send
all primary packet has queued. Otherwise just send the queued primary
@@ -94,7 +94,7 @@ Redirect Server Filter --> COLO-Compare
COLO-compare receive primary guest packet then
waiting secondary redirect packet to compare it.
If packet same,send queued primary packet and clear
-queued secondary packet, Otherwise send primary packet
+queued secondary packet, otherwise send primary packet
and do checkpoint.
COLO-Compare --> Another Redirector Filter
diff --git a/net/colo-compare.c b/net/colo-compare.c
index c07e7c1c09..3efc61c777 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -658,7 +658,7 @@ static void colo_compare_packet(CompareState *s, Connection *conn,
g_queue_remove(&conn->secondary_list, result->data);
} else {
/*
- * If one packet arrive late, the secondary_list or
+ * If one packet arrives late, the secondary_list or
* primary_list will be empty, so we can't compare it
* until next comparison. If the packets in the list are
* timeout, it will trigger a checkpoint request.
@@ -1296,7 +1296,7 @@ static void colo_compare_finalize(Object *obj)
}
}
- /* Release all unhandled packets after compare thead exited */
+ /* Release all unhandled packets after compare thread exited */
g_queue_foreach(&s->conn_list, colo_flush_packets, s);
g_queue_clear(&s->conn_list);
--
2.21.3
next prev parent reply other threads:[~2020-06-14 8:47 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-14 8:45 [PATCH 1/2] migration/colo: fix typo in the COLO Framework module Like Xu
2020-06-14 8:45 ` Like Xu [this message]
2020-06-15 5:49 ` [PATCH 2/2] migration/colo/net: fix typo in the COLO Proxy module Zhang, Chen
2020-06-15 1:36 ` [PATCH 1/2] migration/colo: fix typo in the COLO Framework module Zhanghailiang
2020-06-15 2:23 ` Like Xu
2020-06-15 3:05 ` Zhanghailiang
2020-06-15 4:29 ` Zhang, Chen
2020-06-15 8:48 ` Zhanghailiang
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=20200614084510.7917-2-like.xu@linux.intel.com \
--to=like.xu@linux.intel.com \
--cc=chen.zhang@intel.com \
--cc=lizhijian@cn.fujitsu.com \
--cc=qemu-devel@nongnu.org \
/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).