From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44588) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YTute-0000xZ-FL for qemu-devel@nongnu.org; Fri, 06 Mar 2015 11:14:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YTutb-0008T2-4J for qemu-devel@nongnu.org; Fri, 06 Mar 2015 11:14:42 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58461) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YTuta-0008So-TD for qemu-devel@nongnu.org; Fri, 06 Mar 2015 11:14:39 -0500 Message-ID: <54F9D25B.60101@redhat.com> Date: Fri, 06 Mar 2015 09:14:19 -0700 From: Eric Blake MIME-Version: 1.0 References: <1425478176-12044-1-git-send-email-zhang.zhanghailiang@huawei.com> <1425478176-12044-2-git-send-email-zhang.zhanghailiang@huawei.com> In-Reply-To: <1425478176-12044-2-git-send-email-zhang.zhanghailiang@huawei.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="vjUNgnPqq9sFQxXBbURiuxHDoD1p8mew8" Subject: Re: [Qemu-devel] [PATCH v3 1/4] migration: Rename abbreviated macro MIG_STATE_* to MIGRATION_STATUS_* List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: zhanghailiang , qemu-devel@nongnu.org Cc: quintela@redhat.com, armbru@redhat.com, peter.huangpeng@huawei.com, lcapitulino@redhat.com, amit.shah@redhat.com, dgilbert@redhat.com This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --vjUNgnPqq9sFQxXBbURiuxHDoD1p8mew8 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 03/04/2015 07:09 AM, zhanghailiang wrote: > Signed-off-by: zhanghailiang > --- > migration/migration.c | 93 +++++++++++++++++++++++++++----------------= -------- > 1 file changed, 50 insertions(+), 43 deletions(-) >=20 > diff --git a/migration/migration.c b/migration/migration.c > index b3adbc6..0aafbdf 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -27,13 +27,13 @@ > #include "trace.h" > =20 > enum { > - MIG_STATE_ERROR =3D -1, > - MIG_STATE_NONE, > - MIG_STATE_SETUP, > - MIG_STATE_CANCELLING, > - MIG_STATE_CANCELLED, > - MIG_STATE_ACTIVE, > - MIG_STATE_COMPLETED, > + MIGRATION_STATUS_ERROR =3D -1, Please also rename _ERROR to _FAILED in this patch, so that patch 3/4 is not doing any further renames. And document that the rename is intentional in the body of the commit message. > @@ -251,11 +251,11 @@ MigrationInfo *qmp_query_migrate(Error **errp) > info->ram->mbps =3D s->mbps; > info->ram->dirty_sync_count =3D s->dirty_sync_count; > break; > - case MIG_STATE_ERROR: > + case MIGRATION_STATUS_ERROR: > info->has_status =3D true; > info->status =3D g_strdup("failed"); > break; That is, _this_ patch is the one to make the enum name match the public string. --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --vjUNgnPqq9sFQxXBbURiuxHDoD1p8mew8 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBCAAGBQJU+dJbAAoJEKeha0olJ0NqaggH/2OxgUkzriC9OLCt2GLx5aUb nle0e0jytiAa+tG5HaQPaQfYVaohSfDVBU1/+Fw37azB0Wx7xvtPRm9n+RCuMHis masROTrFtkQzzoLieyfaJ5p8LOKeel+ro221DPaMKXC0L3dX0WLyHdtuzStHNcsY YPzFy9JpjxZ7d/IzAu2Zxnca/Wwov7SCSkbpY8BvEHYpWweVNkK49Qhfnepmtru0 vNAN8ufhnI+Ica50gwD2EutGL1Es+BMRp4/KsArY8yH2g3KMVnZAcvZdeec1T/0U ETEg7R0NRwSrIGE7voBMJ24JmHcqzPyiFCBIh1qXShuyGTubCytqCjFljEZNxbM= =JZ1R -----END PGP SIGNATURE----- --vjUNgnPqq9sFQxXBbURiuxHDoD1p8mew8--