From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54783) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZAGV3-0006mG-JP for qemu-devel@nongnu.org; Wed, 01 Jul 2015 07:48:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZAGV1-0005Ls-Tn for qemu-devel@nongnu.org; Wed, 01 Jul 2015 07:48:21 -0400 Received: from mail-qk0-x229.google.com ([2607:f8b0:400d:c09::229]:36190) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZAGV1-0005Ll-QK for qemu-devel@nongnu.org; Wed, 01 Jul 2015 07:48:19 -0400 Received: by qkei195 with SMTP id i195so26948991qke.3 for ; Wed, 01 Jul 2015 04:48:19 -0700 (PDT) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Wed, 1 Jul 2015 13:47:39 +0200 Message-Id: <1435751267-26378-5-git-send-email-marcandre.lureau@gmail.com> In-Reply-To: <1435751267-26378-1-git-send-email-marcandre.lureau@gmail.com> References: <1435751267-26378-1-git-send-email-marcandre.lureau@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH 04/12] qga: rename 'path' to 'device_path' List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , mdroth@linux.vnet.ibm.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 --- qga/main.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/qga/main.c b/qga/main.c index 0c455f8..1c81575 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, *device_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; + device_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(device_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, device_path)) { g_critical("failed to initialize guest agent channel"); goto out_bad; } -- 2.4.3