SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

qga: Invert logic on return value in main()

Browse Source 
Current logic on return value ('ret' variable) in main() is error
prone. The variable is initialized to EXIT_SUCCESS and then set
to EXIT_FAILURE on error paths. This makes it very easy to forget
to set the variable to indicate error when adding new error path,
as is demonstrated by handling of initialize_agent() failure.
It's simply lacking setting of the variable.

There's just one case where success should be indicated: when
dumping the config ('-D' cmd line argument).

To resolve this, initialize the variable to failure value and set
it explicitly to success value in that one specific case.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
Message-ID: <8a28265f50177a8dc4c10fcf4146e85a7fd748ee.1736261360.git.mprivozn@redhat.com>
Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
This commit is contained in:
Michal Privoznik 2025-01-07 15:52:06 +01:00 committed by Konstantin Kostiuk
parent ad1e684363
commit 5b567c21c6
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qga/main.c
View File

@ -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);
} }