From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33872) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUMQW-0006Tz-5d for qemu-devel@nongnu.org; Tue, 25 Aug 2015 18:10:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZUMQR-0002YV-3d for qemu-devel@nongnu.org; Tue, 25 Aug 2015 18:10:44 -0400 Received: from mail-qg0-x235.google.com ([2607:f8b0:400d:c04::235]:33472) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUMQQ-0002YM-Pn for qemu-devel@nongnu.org; Tue, 25 Aug 2015 18:10:38 -0400 Received: by qgeh99 with SMTP id h99so56184226qge.0 for ; Tue, 25 Aug 2015 15:10:38 -0700 (PDT) Sender: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= From: marcandre.lureau@redhat.com Date: Wed, 26 Aug 2015 00:10:16 +0200 Message-Id: <1440540624-7998-5-git-send-email-marcandre.lureau@redhat.com> In-Reply-To: <1440540624-7998-1-git-send-email-marcandre.lureau@redhat.com> References: <1440540624-7998-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [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: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , mdroth@linux.vnet.ibm.com From: Marc-André 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é Lureau --- 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; } -- 2.4.3