From nobody Fri Dec 19 04:10:39 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=1733415579; cv=none; d=zohomail.com; s=zohoarc; b=P+c7czqc5t6ZpRsWpENPBIIARA2sKMG+lFJlhRPgqaXyjNxQZb/aZWVNCo5b8+c4pU/3KuLgyO/HflJp9c3u0ESfz63wTYADPafhyMvI2R/UB18SJogZGWZAwWuvc/9sxW8OKL4gKuLxxfnkrO7CNxI0Y38W66n91YG58zeFmh0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1733415579; 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=Yp6aVcAA3I35w75TyPFDbQXTPmoEzUthsmqoDsaMPxglwwX5hAjrz3fXyb6uxkA53BSVqim1gL+L/9p+gzBHf6zNc6QvRbG3nQCLylJvBhFGV7Gv03T0fbNMKYHmtDXfUzBQH8tvtFvV03rGeqi2S22kD5xRObZf3ejvccWjtiQ= 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= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1733415579669577.1131397538167; Thu, 5 Dec 2024 08:19:39 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tJEZZ-0004WK-TW; Thu, 05 Dec 2024 11:19:27 -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 ) id 1tJEZR-0004Vw-30 for qemu-devel@nongnu.org; Thu, 05 Dec 2024 11:19:17 -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 ) id 1tJEZP-0007nj-Hx for qemu-devel@nongnu.org; Thu, 05 Dec 2024 11:19:16 -0500 Received: from mx-prod-mc-05.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-311-AX5DPnzXP12EAsDLnDXHtg-1; Thu, 05 Dec 2024 11:19:13 -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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CA80219560A3; Thu, 5 Dec 2024 16:19:12 +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 528DC3000197; Thu, 5 Dec 2024 16:19:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1733415554; 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=SqxEJReJ0qFRBeWmAHTaZEvX7ULt3ajZEN+DcSm2n3o/R0H879cwZHp5hpy7aCDOv+7Lqw 1x7Ka+5YwPSmtNonsb5OsqxR6aZvS6xcFAOR3DhuT4SxsmykKtx91RJl9tDomDmeqDUVhD fmhBU0TRFfBVKDXsdpJ6n6QRljvpOFA= X-MC-Unique: AX5DPnzXP12EAsDLnDXHtg-1 X-Mimecast-MFC-AGG-ID: AX5DPnzXP12EAsDLnDXHtg From: Michal Privoznik To: qemu-devel@nongnu.org Cc: kkostiuk@redhat.com, michael.roth@amd.com, jtomko@redhat.com Subject: [PATCH v2 2/4] qga: Invert logic on return value in main() Date: Thu, 5 Dec 2024 17:18:46 +0100 Message-ID: <9316535a7cd0e73983b57c2c775d6bfc566d4b08.1733414906.git.mprivozn@redhat.com> In-Reply-To: References: 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: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.996, 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_MSPIKE_H2=-0.001, 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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: 1733415585009116600 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 Reviewed-by: J=C3=A1n Tomko --- 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