| Message ID | 20200614084510.7917-2-like.xu@linux.intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] migration/colo: fix typo in the COLO Framework module | expand |
> -----Original Message----- > From: Like Xu <like.xu@linux.intel.com> > Sent: Sunday, June 14, 2020 4:45 PM > To: qemu-devel@nongnu.org > Cc: Like Xu <like.xu@linux.intel.com>; Zhang, Chen <chen.zhang@intel.com>; > Li Zhijian <lizhijian@cn.fujitsu.com> > Subject: [PATCH 2/2] migration/colo/net: fix typo in the COLO Proxy module > > Cc: Zhang Chen <chen.zhang@intel.com> > Cc: Li Zhijian <lizhijian@cn.fujitsu.com> > Signed-off-by: Like Xu <like.xu@linux.intel.com> Looks good to me. By the way, add CC qemu-trivial@nongnu.org Reviewed-by: Zhang Chen <chen.zhang@intel.com> Thanks Zhang Chen > --- > 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
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);
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(-)