From nobody Mon Apr 14 14:54:35 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1736261581; cv=none;
d=zohomail.com; s=zohoarc;
b=hD6/Iu4F0zCK0X0ismHwYgiy7f2IyUtypWOZSRMYVfXRA+9ftNhwAhT287XR+2RNXfAc12zANkgR5/8M04LpClQalRERAN+1D94ZkppSI869y71g7Kv1EvlqZHoQe8hvwhmqCPtRcfti219/K6WMsAhLSmnDvgK2plKws/RqK6M=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1736261581;
h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=v7fSVaL4A+NJUb5Qfu7/DO8n7m7CrRilZSxiNE2PvZg=;
b=YUpDAl25fBqmUnpcicuJi4juUyUx854X9erc0uzS6QstkHxO9mRzvD3J9NcrKTI6YIRC+/hLDQ/X3WbjsQ7Y0EVylaFW+mNSKVNgUkROXJ2fHtMq9HN2P/urM71x+JtjTAfETzau70GYYNzWJofAaTeTig3O/jVFaeBWL9A4Mj0=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<mprivozn@redhat.com> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1736261581806119.60015676539433;
Tue, 7 Jan 2025 06:53:01 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tVAwY-0003Gz-TS; Tue, 07 Jan 2025 09:52:30 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <mprivozn@redhat.com>)
id 1tVAwU-0003FX-56
for qemu-devel@nongnu.org; Tue, 07 Jan 2025 09:52:27 -0500
Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <mprivozn@redhat.com>)
id 1tVAwP-0007jl-WC
for qemu-devel@nongnu.org; Tue, 07 Jan 2025 09:52:25 -0500
Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com
(ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by
relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,
cipher=TLS_AES_256_GCM_SHA384) id us-mta-617-hUNVRimPPoyZSnLzrYbekg-1; Tue,
07 Jan 2025 09:52:18 -0500
Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com
(mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest
SHA256)
(No client certificate requested)
by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS
id 12E08195609E; Tue, 7 Jan 2025 14:52:17 +0000 (UTC)
Received: from moe.brq.redhat.com (unknown [10.43.3.236])
by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP
id 981173000197; Tue, 7 Jan 2025 14:52:15 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1736261540;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=v7fSVaL4A+NJUb5Qfu7/DO8n7m7CrRilZSxiNE2PvZg=;
b=BTgicFREg16BzDMoP6TaXhVyA4LvQwIJTj5dReMWIhuWse29WZW1WfVchwr7FgYnz/yuvh
6FyC9T+pi9J+ws/G6g2hiV3MyelOA8o9eLsJv9se2GLFxb+KpIJYBtrb7V7AfxQwWmNDbn
w1JDgMOzGM4jbVnBi0LZJ0vORVh2KmU=
X-MC-Unique: hUNVRimPPoyZSnLzrYbekg-1
X-Mimecast-MFC-AGG-ID: hUNVRimPPoyZSnLzrYbekg
From: Michal Privoznik <mprivozn@redhat.com>
To: qemu-devel@nongnu.org
Cc: kkostiuk@redhat.com,
michael.roth@amd.com,
jtomko@redhat.com
Subject: [PATCH v3 1/2] qga: Invert logic on return value in main()
Date: Tue, 7 Jan 2025 15:52:06 +0100
Message-ID:
<8a28265f50177a8dc4c10fcf4146e85a7fd748ee.1736261360.git.mprivozn@redhat.com>
In-Reply-To: <cover.1736261360.git.mprivozn@redhat.com>
References: <cover.1736261360.git.mprivozn@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=170.10.129.124;
envelope-from=mprivozn@redhat.com;
helo=us-smtp-delivery-124.mimecast.com
X-Spam_score_int: -24
X-Spam_score: -2.5
X-Spam_bar: --
X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.437,
DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001,
RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @redhat.com)
X-ZM-MESSAGEID: 1736261582967116600
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=C3=A1n Tomko <jtomko@redhat.com>
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
---
qga/main.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/qga/main.c b/qga/main.c
index 4a695235f0..68ea7f275a 100644
--- a/qga/main.c
+++ b/qga/main.c
@@ -1579,7 +1579,7 @@ static void stop_agent(GAState *s, bool requested)
=20
int main(int argc, char **argv)
{
- int ret =3D EXIT_SUCCESS;
+ int ret =3D EXIT_FAILURE;
GAState *s;
GAConfig *config =3D g_new0(GAConfig, 1);
int socket_activation;
@@ -1607,7 +1607,6 @@ int main(int argc, char **argv)
socket_activation =3D check_socket_activation();
if (socket_activation > 1) {
g_critical("qemu-ga only supports listening on one socket");
- ret =3D EXIT_FAILURE;
goto end;
}
if (socket_activation) {
@@ -1631,7 +1630,6 @@ int main(int argc, char **argv)
=20
if (!config->method) {
g_critical("unsupported listen fd type");
- ret =3D EXIT_FAILURE;
goto end;
}
} else if (config->channel_path =3D=3D NULL) {
@@ -1643,13 +1641,13 @@ int main(int argc, char **argv)
config->channel_path =3D g_strdup(QGA_SERIAL_PATH_DEFAULT);
} else {
g_critical("must specify a path for this channel");
- ret =3D EXIT_FAILURE;
goto end;
}
}
=20
if (config->dumpconf) {
config_dump(config);
+ ret =3D EXIT_SUCCESS;
goto end;
}
=20
@@ -1664,6 +1662,7 @@ int main(int argc, char **argv)
SERVICE_TABLE_ENTRY service_table[] =3D {
{ (char *)QGA_SERVICE_NAME, service_main }, { NULL, NULL } };
StartServiceCtrlDispatcher(service_table);
+ ret =3D EXIT_SUCCESS;
} else {
ret =3D run_agent(s);
}
--=20
2.45.2