RE: [PATCH 1/2] migration/colo: fix typo in the COLO Framework module

[Zhang, Chen]

It looks normal to me.

Thanks
Zhang Chen

> -----Original Message-----
> From: Qemu-devel <qemu-devel-
> bounces+chen.zhang=intel.com@nongnu.org> On Behalf Of Zhanghailiang
> Sent: Monday, June 15, 2020 11:06 AM
> To: Like Xu <like.xu@linux.intel.com>; qemu-devel@nongnu.org
> Subject: RE: [PATCH 1/2] migration/colo: fix typo in the COLO Framework
> module
> 
> 
> I have checked this patch in mail archive, it has no problem, It seems that my
> email setup has some problem. It didn't show the right newline In this patch.
> 
> 
> > -----Original Message-----
> > From: Like Xu [mailto:like.xu@linux.intel.com]
> > Sent: Monday, June 15, 2020 10:24 AM
> > To: Zhanghailiang <zhang.zhanghailiang@huawei.com>;
> > qemu-devel@nongnu.org
> > Subject: Re: [PATCH 1/2] migration/colo: fix typo in the COLO
> > Framework module
> >
> > On 2020/6/15 9:36, Zhanghailiang wrote:
> > > Hi Like,
> > >
> > > Please check this patch, It seems that you didn't use git
> > > format-patch command to generate this patch, It is in wrong format.
> >
> > I rebase the patch on the top commit of
> > 7d3660e79830a069f1848bb4fa1cdf8f666424fb,
> > and hope it helps you.
> >
> > >
> > > Thanks,
> > > Hailiang
> >
> >  From 15c19be9be07598d4264a4a84b85d4efa79bff9d Mon Sep 17
> > 00:00:00 2001
> > From: Like Xu <like.xu@linux.intel.com>
> > Date: Mon, 15 Jun 2020 10:10:57 +0800
> > Subject: [PATCH 1/2] migration/colo: fix typo in the COLO Framework
> > module
> >
> > Cc: Hailiang Zhang <zhang.zhanghailiang@huawei.com>
> > Signed-off-by: Like Xu <like.xu@linux.intel.com>
> > ---
> >   docs/COLO-FT.txt | 8 ++++----
> >   migration/colo.c | 2 +-
> >   2 files changed, 5 insertions(+), 5 deletions(-)
> >
> > diff --git a/docs/COLO-FT.txt b/docs/COLO-FT.txt index
> > c8e1740935..fdc0207cff 100644
> > --- a/docs/COLO-FT.txt
> > +++ b/docs/COLO-FT.txt
> > @@ -10,7 +10,7 @@ See the COPYING file in the top-level directory.
> >   This document gives an overview of COLO's design and how to use it.
> >
> >   == Background ==
> > -Virtual machine (VM) replication is a well known technique for
> > providing
> > +Virtual machine (VM) replication is a well-known technique for
> > +providing
> >   application-agnostic software-implemented hardware fault tolerance,
> >   also known as "non-stop service".
> >
> > @@ -103,7 +103,7 @@ Primary side.
> >
> >   COLO Proxy:
> >   Delivers packets to Primary and Secondary, and then compare the
> > responses from -both side. Then decide whether to start a checkpoint
> > according to some rules.
> > +both sides. Then decide whether to start a checkpoint according to
> > +some
> > rules.
> >   Please refer to docs/colo-proxy.txt for more information.
> >
> >   Note:
> > @@ -146,12 +146,12 @@ in test procedure.
> >
> >   == Test procedure ==
> >   Note: Here we are running both instances on the same host for
> > testing, -change the IP Addresses if you want to run it on two hosts.
> > Initally
> > +change the IP Addresses if you want to run it on two hosts. Initially
> >   127.0.0.1 is the Primary Host and 127.0.0.2 is the Secondary Host.
> >
> >   == Startup qemu ==
> >   1. Primary:
> > -Note: Initally, $imagefolder/primary.qcow2 needs to be copied to all hosts.
> > +Note: Initially, $imagefolder/primary.qcow2 needs to be copied to all
> hosts.
> >   You don't need to change any IP's here, because 0.0.0.0 listens on any
> >   interface. The chardev's with 127.0.0.1 IP's loopback to the local qemu
> >   instance.
> > diff --git a/migration/colo.c b/migration/colo.c index
> > ea7d1e9d4e..80788d46b5 100644
> > --- a/migration/colo.c
> > +++ b/migration/colo.c
> > @@ -632,7 +632,7 @@ out:
> >       /*
> >        * It is safe to unregister notifier after failover finished.
> >        * Besides, colo_delay_timer and colo_checkpoint_sem can't be
> > -     * released befor unregister notifier, or there will be use-after-free
> > +     * released before unregister notifier, or there will be
> > + use-after-free
> >        * error.
> >        */
> >       colo_compare_unregister_notifier(&packets_compare_notifier);
> > --
> > 2.21.3
> >