aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2015-08-27 01:34:51 +0200
committerMichael Roth <mdroth@linux.vnet.ibm.com>2015-09-01 11:07:10 -0500
commit44de156ca7bfaf899745291a0d603d4f7550f5ea (patch)
treebab75f43a5f278be0460b591fa833f0b74ba991c
parent4bca81ceedb59397f6082777f6ed4b39d456be85 (diff)
qga: rename 'path' to 'channel_path'
'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> Reviewed-by: Denis V. Lunev <den@openvz.org> Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
-rw-r--r--qga/main.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/qga/main.c b/qga/main.c
index a7df6c83b1..7fa6dccdc6 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;
}