Commit 44de156c authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Michael Roth
Browse files

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: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarMichael Roth <mdroth@linux.vnet.ibm.com>
Reviewed-by: default avatarDenis V. Lunev <den@openvz.org>
Signed-off-by: default avatarMichael Roth <mdroth@linux.vnet.ibm.com>
parent 4bca81ce

qga/main.c

+5 −4
Original line number Diff line number Diff line
@@ -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;

    }