From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44639) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUMks-00010u-E3 for qemu-devel@nongnu.org; Tue, 25 Aug 2015 18:31:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZUMkp-0000Jw-8T for qemu-devel@nongnu.org; Tue, 25 Aug 2015 18:31:46 -0400 Received: from e19.ny.us.ibm.com ([129.33.205.209]:40052) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUMkp-0000Jq-5X for qemu-devel@nongnu.org; Tue, 25 Aug 2015 18:31:43 -0400 Received: from /spool/local by e19.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 25 Aug 2015 18:31:43 -0400 Received: from b01cxnp23034.gho.pok.ibm.com (b01cxnp23034.gho.pok.ibm.com [9.57.198.29]) by d01dlp03.pok.ibm.com (Postfix) with ESMTP id 861EDC90058 for ; Tue, 25 Aug 2015 18:22:45 -0400 (EDT) Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by b01cxnp23034.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t7PMVeLb52232338 for ; Tue, 25 Aug 2015 22:31:40 GMT Received: from d01av04.pok.ibm.com (localhost [127.0.0.1]) by d01av04.pok.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t7PMVell000977 for ; Tue, 25 Aug 2015 18:31:40 -0400 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Roth In-Reply-To: <1440540624-7998-5-git-send-email-marcandre.lureau@redhat.com> References: <1440540624-7998-1-git-send-email-marcandre.lureau@redhat.com> <1440540624-7998-5-git-send-email-marcandre.lureau@redhat.com> Message-ID: <20150825222908.11069.75811@loki> Date: Tue, 25 Aug 2015 17:29:08 -0500 Subject: Re: [Qemu-devel] [PATCH v2 04/12] qga: rename 'path' to 'channel_path' List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: marcandre.lureau@redhat.com, qemu-devel@nongnu.org Quoting marcandre.lureau@redhat.com (2015-08-25 17:10:16) > From: Marc-Andr=C3=A9 Lureau > = > 'path' is already a global function, rename the variable since it's > going to be in global scope in a later patch. > = > Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Michael Roth > --- > qga/main.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > = > diff --git a/qga/main.c b/qga/main.c > index e75022c..ede5306 100644 > --- a/qga/main.c > +++ b/qga/main.c > @@ -944,7 +944,7 @@ static GList *split_list(gchar *str, const gchar sepa= rator) > int main(int argc, char **argv) > { > const char *sopt =3D "hVvdm:p:l:f:F::b:s:t:"; > - const char *method =3D NULL, *path =3D NULL; > + const char *method =3D NULL, *channel_path =3D NULL; > const char *log_filepath =3D NULL; > const char *pid_filepath; > #ifdef CONFIG_FSFREEZE > @@ -990,7 +990,7 @@ int main(int argc, char **argv) > method =3D optarg; > break; > case 'p': > - path =3D optarg; > + channel_path =3D optarg; > break; > case 'l': > log_filepath =3D optarg; > @@ -1040,7 +1040,8 @@ int main(int argc, char **argv) > if (ga_install_vss_provider()) { > exit(EXIT_FAILURE); > } > - if (ga_install_service(path, log_filepath, fixed_state_d= ir)) { > + if (ga_install_service(channel_path, log_filepath, > + fixed_state_dir)) { > exit(EXIT_FAILURE); > } > exit(EXIT_SUCCESS); > @@ -1185,7 +1186,7 @@ int main(int argc, char **argv) > #endif > = > s->main_loop =3D g_main_loop_new(NULL, false); > - if (!channel_init(ga_state, method, path)) { > + if (!channel_init(ga_state, method, channel_path)) { > g_critical("failed to initialize guest agent channel"); > goto out_bad; > } > -- = > 2.4.3 >=20