From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:47283)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <den-lists@parallels.com>) id 1ZUevi-0007fP-IU
	for qemu-devel@nongnu.org; Wed, 26 Aug 2015 13:56:14 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <den-lists@parallels.com>) id 1ZUevh-00043o-Hb
	for qemu-devel@nongnu.org; Wed, 26 Aug 2015 13:56:10 -0400
Received: from mx2.parallels.com ([199.115.105.18]:47119)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <den-lists@parallels.com>) id 1ZUevh-00043c-B4
	for qemu-devel@nongnu.org; Wed, 26 Aug 2015 13:56:09 -0400
References: <1440583525-21632-1-git-send-email-marcandre.lureau@redhat.com>
	<1440583525-21632-5-git-send-email-marcandre.lureau@redhat.com>
From: "Denis V. Lunev" <den-lists@parallels.com>
Message-ID: <55DDFDB2.6050308@parallels.com>
Date: Wed, 26 Aug 2015 20:56:02 +0300
MIME-Version: 1.0
In-Reply-To: <1440583525-21632-5-git-send-email-marcandre.lureau@redhat.com>
Content-Type: text/plain; charset="utf-8"; format=flowed
Content-Transfer-Encoding: 8bit
Subject: Re: [Qemu-devel] [PATCH v3 04/12] qga: rename 'path' to
 'channel_path'
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: marcandre.lureau@redhat.com, qemu-devel@nongnu.org
Cc: mdroth@linux.vnet.ibm.com

On 08/26/2015 01:05 PM, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> '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é Lureau <marcandre.lureau@redhat.com>
> Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com>
> ---
>   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 separator)
>   int main(int argc, char **argv)
>   {
>       const char *sopt = "hVvdm:p:l:f:F::b:s:t:";
> -    const char *method = NULL, *path = NULL;
> +    const char *method = NULL, *channel_path = NULL;
>       const char *log_filepath = NULL;
>       const char *pid_filepath;
>   #ifdef CONFIG_FSFREEZE
> @@ -990,7 +990,7 @@ int main(int argc, char **argv)
>               method = optarg;
>               break;
>           case 'p':
> -            path = optarg;
> +            channel_path = optarg;
>               break;
>           case 'l':
>               log_filepath = 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_dir)) {
> +                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 = 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;
>       }
Reviewed-by: Denis V. Lunev <den@openvz.org>