openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Marc-André Lureau 2015-08-27 01:34:51 +02:00 committed by Michael Roth
parent 4bca81ceed
commit 44de156ca7
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qga/main.c
View File

@ -939,7 +939,7 @@ static GList *split_list(const gchar *str, const gchar *delim)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
const char *sopt = "hVvdm:p:l:f:F::b:s:t:"; 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 *log_filepath = NULL;
const char *pid_filepath; const char *pid_filepath;
#ifdef CONFIG_FSFREEZE #ifdef CONFIG_FSFREEZE
@ -985,7 +985,7 @@ int main(int argc, char **argv)
method = optarg; method = optarg;
break; break;
case 'p': case 'p':
path = optarg; channel_path = optarg;
break; break;
case 'l': case 'l':
log_filepath = optarg; log_filepath = optarg;
@ -1035,7 +1035,8 @@ int main(int argc, char **argv)
if (ga_install_vss_provider()) { if (ga_install_vss_provider()) {
exit(EXIT_FAILURE); 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_FAILURE);
} }
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
@ -1180,7 +1181,7 @@ int main(int argc, char **argv)
#endif #endif
s->main_loop = g_main_loop_new(NULL, false); 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"); g_critical("failed to initialize guest agent channel");
goto out_bad; goto out_bad;
} }