[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/12] qga: rename 'path' to 'device_path'
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH 04/12] qga: rename 'path' to 'device_path' |
Date: |
Wed, 1 Jul 2015 13:47:39 +0200 |
'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 <address@hidden>
---
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
- [Qemu-devel] [PATCH 00/12] qemu-ga: add a configuration file, Marc-André Lureau, 2015/07/01
- [Qemu-devel] [PATCH 01/12] qga: misc spelling, Marc-André Lureau, 2015/07/01
- [Qemu-devel] [PATCH 02/12] qga: use exit() when parsing options, Marc-André Lureau, 2015/07/01
- [Qemu-devel] [PATCH 03/12] qga: move string split in seperate function, Marc-André Lureau, 2015/07/01
- [Qemu-devel] [PATCH 04/12] qga: rename 'path' to 'device_path',
Marc-André Lureau <=
- [Qemu-devel] [PATCH 05/12] qga: copy argument strings, Marc-André Lureau, 2015/07/01
- [Qemu-devel] [PATCH 06/12] qga: move option parsing to seperate function, Marc-André Lureau, 2015/07/01
- [Qemu-devel] [PATCH 07/12] qga: fill default options in main(), Marc-André Lureau, 2015/07/01
- [Qemu-devel] [PATCH 08/12] qga: move agent run in a seperate function, Marc-André Lureau, 2015/07/01
- [Qemu-devel] [PATCH 09/12] qga: free a bit more, Marc-André Lureau, 2015/07/01
- [Qemu-devel] [PATCH 11/12] qga: add an optionnal qemu-ga.conf system configuration, Marc-André Lureau, 2015/07/01
- [Qemu-devel] [PATCH 10/12] qga: add --dump-conf option, Marc-André Lureau, 2015/07/01
- [Qemu-devel] [PATCH 12/12] qga: start a man page, Marc-André Lureau, 2015/07/01
- Re: [Qemu-devel] [PATCH 00/12] qemu-ga: add a configuration file, Marc-André Lureau, 2015/07/29