From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55858) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzOQb-0006RF-FO for qemu-devel@nongnu.org; Wed, 26 Oct 2016 09:39:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bzOQY-0002FC-41 for qemu-devel@nongnu.org; Wed, 26 Oct 2016 09:39:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32902) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bzOQX-0002Ew-RY for qemu-devel@nongnu.org; Wed, 26 Oct 2016 09:39:34 -0400 References: <1476792613-11712-1-git-send-email-zhang.zhanghailiang@huawei.com> <1476792613-11712-11-git-send-email-zhang.zhanghailiang@huawei.com> <20161026054516.GJ1679@amit-lp.rh> From: Eric Blake Message-ID: <6491a1d9-96f7-f532-3f8d-907de59fa440@redhat.com> Date: Wed, 26 Oct 2016 08:39:29 -0500 MIME-Version: 1.0 In-Reply-To: <20161026054516.GJ1679@amit-lp.rh> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="UB75nMp8kWSfIEsiO6NlcvMucMe1TXm16" Subject: Re: [Qemu-devel] [PATCH COLO-Frame (Base) v21 10/17] COLO: Add checkpoint-delay parameter for migrate-set-parameters List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Amit Shah , zhanghailiang Cc: quintela@redhat.com, qemu-devel@nongnu.org, dgilbert@redhat.com, wency@cn.fujitsu.com, lizhijian@cn.fujitsu.com, xiecl.fnst@cn.fujitsu.com, Luiz Capitulino , Markus Armbruster This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --UB75nMp8kWSfIEsiO6NlcvMucMe1TXm16 From: Eric Blake To: Amit Shah , zhanghailiang Cc: quintela@redhat.com, qemu-devel@nongnu.org, dgilbert@redhat.com, wency@cn.fujitsu.com, lizhijian@cn.fujitsu.com, xiecl.fnst@cn.fujitsu.com, Luiz Capitulino , Markus Armbruster Message-ID: <6491a1d9-96f7-f532-3f8d-907de59fa440@redhat.com> Subject: Re: [PATCH COLO-Frame (Base) v21 10/17] COLO: Add checkpoint-delay parameter for migrate-set-parameters References: <1476792613-11712-1-git-send-email-zhang.zhanghailiang@huawei.com> <1476792613-11712-11-git-send-email-zhang.zhanghailiang@huawei.com> <20161026054516.GJ1679@amit-lp.rh> In-Reply-To: <20161026054516.GJ1679@amit-lp.rh> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 10/26/2016 12:45 AM, Amit Shah wrote: > On (Tue) 18 Oct 2016 [20:10:06], zhanghailiang wrote: >> Add checkpoint-delay parameter for migrate-set-parameters, so that >> we can control the checkpoint frequency when COLO is in periodic mode.= >> >> Cc: Luiz Capitulino >> Cc: Eric Blake >> Cc: Markus Armbruster >> Signed-off-by: zhanghailiang >> Signed-off-by: Li Zhijian >> Reviewed-by: Dr. David Alan Gilbert >=20 >=20 >> @@ -1363,7 +1366,6 @@ void hmp_migrate_set_parameter(Monitor *mon, con= st QDict *qdict) >> case MIGRATION_PARAMETER_CPU_THROTTLE_INCREMENT: >> p.has_cpu_throttle_increment =3D true; >> use_int_value =3D true; >> - break; >=20 > Hm? >=20 Looks like an improper conflict resolution after commit bb2b777. Definitely a hunk that does not belong in this patch; but with it removed, the rest of the patch earns: Reviewed-by: Eric Blake --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --UB75nMp8kWSfIEsiO6NlcvMucMe1TXm16 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBCAAGBQJYELIRAAoJEKeha0olJ0Nqgp4H/1VoG6nqjPKkXED4763q7MYk iM9jc7FGRMIAomsm0EJGabA7tQTyyUJbmjqpGjJb0p3QBpM787udOt5avqzs2com v1iB74TspS/ZkcLh3dclmxl96WoFW2ZhEjuapktm+AbDasAveDQZm6DZNawfJuGa +XCLgvog6ZFRHhGxBOWbPGrZ/ufaTQrDW7ZQD/Rr/pRkyoSPXvqL0qDtrldO54xZ nNRuPz6utTU0iE7y6HEOOYQOcCZ+8k2aAXiFUP2BQPVHxT1aM3Uyr4bha8vohCZp 394f3Xb92OQNYssUw8GeMcdWgTlWZKivkHkdX1ICRUHRyeOvp0ykwPs6dpMQ3C4= =LTvM -----END PGP SIGNATURE----- --UB75nMp8kWSfIEsiO6NlcvMucMe1TXm16--