From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51948) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZWqTh-0008Hl-Ty for qemu-devel@nongnu.org; Tue, 01 Sep 2015 14:40:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZWqTd-0007EO-SF for qemu-devel@nongnu.org; Tue, 01 Sep 2015 14:40:17 -0400 Received: from e18.ny.us.ibm.com ([129.33.205.208]:34804) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZWqTd-0007E3-Fg for qemu-devel@nongnu.org; Tue, 01 Sep 2015 14:40:13 -0400 Received: from /spool/local by e18.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 1 Sep 2015 14:40:13 -0400 Received: from b01cxnp23034.gho.pok.ibm.com (b01cxnp23034.gho.pok.ibm.com [9.57.198.29]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id 93F566E8041 for ; Tue, 1 Sep 2015 14:31:54 -0400 (EDT) Received: from d01av05.pok.ibm.com (d01av05.pok.ibm.com [9.56.224.195]) by b01cxnp23034.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t81Ie2VP59506688 for ; Tue, 1 Sep 2015 18:40:10 GMT Received: from d01av05.pok.ibm.com (localhost [127.0.0.1]) by d01av05.pok.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t81Idbf6010625 for ; Tue, 1 Sep 2015 14:39:37 -0400 From: Michael Roth Date: Tue, 1 Sep 2015 13:38:50 -0500 Message-Id: <1441132743-26228-14-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1441132743-26228-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1441132743-26228-1-git-send-email-mdroth@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH 13/26] qga: rename 'path' to 'channel_path' List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Michael Roth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= 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 Reviewed-by: Michael Roth Reviewed-by: Denis V. Lunev Signed-off-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 a7df6c8..7fa6dcc 100644 --- a/qga/main.c +++ b/qga/main.c @@ -939,7 +939,7 @@ static GList *split_list(const gchar *str, const gchar *delim) 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 @@ -985,7 +985,7 @@ int main(int argc, char **argv) method = optarg; break; case 'p': - path = optarg; + channel_path = optarg; break; case 'l': log_filepath = optarg; @@ -1035,7 +1035,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); @@ -1180,7 +1181,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; } -- 1.9.1