|
@@ -1579,7 +1579,7 @@ static void stop_agent(GAState *s, bool requested)
|
|
|
|
|
|
int main(int argc, char **argv)
|
|
int main(int argc, char **argv)
|
|
{
|
|
{
|
|
- int ret = EXIT_SUCCESS;
|
|
|
|
|
|
+ int ret = EXIT_FAILURE;
|
|
GAState *s;
|
|
GAState *s;
|
|
GAConfig *config = g_new0(GAConfig, 1);
|
|
GAConfig *config = g_new0(GAConfig, 1);
|
|
int socket_activation;
|
|
int socket_activation;
|
|
@@ -1607,7 +1607,6 @@ int main(int argc, char **argv)
|
|
socket_activation = check_socket_activation();
|
|
socket_activation = check_socket_activation();
|
|
if (socket_activation > 1) {
|
|
if (socket_activation > 1) {
|
|
g_critical("qemu-ga only supports listening on one socket");
|
|
g_critical("qemu-ga only supports listening on one socket");
|
|
- ret = EXIT_FAILURE;
|
|
|
|
goto end;
|
|
goto end;
|
|
}
|
|
}
|
|
if (socket_activation) {
|
|
if (socket_activation) {
|
|
@@ -1631,7 +1630,6 @@ int main(int argc, char **argv)
|
|
|
|
|
|
if (!config->method) {
|
|
if (!config->method) {
|
|
g_critical("unsupported listen fd type");
|
|
g_critical("unsupported listen fd type");
|
|
- ret = EXIT_FAILURE;
|
|
|
|
goto end;
|
|
goto end;
|
|
}
|
|
}
|
|
} else if (config->channel_path == NULL) {
|
|
} else if (config->channel_path == NULL) {
|
|
@@ -1643,13 +1641,13 @@ int main(int argc, char **argv)
|
|
config->channel_path = g_strdup(QGA_SERIAL_PATH_DEFAULT);
|
|
config->channel_path = g_strdup(QGA_SERIAL_PATH_DEFAULT);
|
|
} else {
|
|
} else {
|
|
g_critical("must specify a path for this channel");
|
|
g_critical("must specify a path for this channel");
|
|
- ret = EXIT_FAILURE;
|
|
|
|
goto end;
|
|
goto end;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
if (config->dumpconf) {
|
|
if (config->dumpconf) {
|
|
config_dump(config);
|
|
config_dump(config);
|
|
|
|
+ ret = EXIT_SUCCESS;
|
|
goto end;
|
|
goto end;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1664,6 +1662,7 @@ int main(int argc, char **argv)
|
|
SERVICE_TABLE_ENTRY service_table[] = {
|
|
SERVICE_TABLE_ENTRY service_table[] = {
|
|
{ (char *)QGA_SERVICE_NAME, service_main }, { NULL, NULL } };
|
|
{ (char *)QGA_SERVICE_NAME, service_main }, { NULL, NULL } };
|
|
StartServiceCtrlDispatcher(service_table);
|
|
StartServiceCtrlDispatcher(service_table);
|
|
|
|
+ ret = EXIT_SUCCESS;
|
|
} else {
|
|
} else {
|
|
ret = run_agent(s);
|
|
ret = run_agent(s);
|
|
}
|
|
}
|