[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 04/12] qga: rename 'path' to 'channel_path'
From: |
Michael Roth |
Subject: |
Re: [Qemu-devel] [PATCH v2 04/12] qga: rename 'path' to 'channel_path' |
Date: |
Tue, 25 Aug 2015 17:29:08 -0500 |
User-agent: |
alot/0.3.6 |
Quoting address@hidden (2015-08-25 17:10:16)
> From: Marc-André Lureau <address@hidden>
>
> '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>
Reviewed-by: Michael Roth <address@hidden>
> ---
> 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
>
- [Qemu-devel] [PATCH v2 01/12] qga: misc spelling, (continued)
- [Qemu-devel] [PATCH v2 01/12] qga: misc spelling, marcandre . lureau, 2015/08/25
- [Qemu-devel] [PATCH v2 02/12] qga: use exit() when parsing options, marcandre . lureau, 2015/08/25
- [Qemu-devel] [PATCH v2 03/12] qga: move string split in separate function, marcandre . lureau, 2015/08/25
- [Qemu-devel] [PATCH v2 05/12] qga: copy argument strings, marcandre . lureau, 2015/08/25
- [Qemu-devel] [PATCH v2 04/12] qga: rename 'path' to 'channel_path', marcandre . lureau, 2015/08/25
- Re: [Qemu-devel] [PATCH v2 04/12] qga: rename 'path' to 'channel_path',
Michael Roth <=
- [Qemu-devel] [PATCH v2 06/12] qga: move option parsing to seperate function, marcandre . lureau, 2015/08/25
- [Qemu-devel] [PATCH v2 09/12] qga: free a bit more, marcandre . lureau, 2015/08/25
- [Qemu-devel] [PATCH v2 07/12] qga: fill default options in main(), marcandre . lureau, 2015/08/25
- [Qemu-devel] [PATCH v2 10/12] qga: add an optionnal qemu-ga.conf system configuration, marcandre . lureau, 2015/08/25