From nobody Sat Nov 23 19:46:22 2024 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=1730714103; cv=none; d=zohomail.com; s=zohoarc; b=R7DaLSWHWUh7WJZIuDmWwg20Id84A2yHx1a26IwxXLkfbkxG4mQ5ub9Tg2XGEkdwZtHYp0QsyuXFVGvQtHoxTmYYlJHpo0J+b0/H5T62/o9NGvyRcCGl8s30i8sXvyx+5T1WBBEYQRKwqE6aZjFNxE5IPx3QFKqAS4sumZEOupI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1730714103; h=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=1ZCdMFWAW+p9eCpAkQpTmJsY+P5AFLG61GLV7l5sZKw=; b=F7XmPLq/fBNzQfOJVh6ok9CpnbwDPs21642Q/pZ0z4WgkY4ruJ/Q2s80MR5fUnTZ2/UDXN+CcLUgb9N0u6z4U6GP/1dBTHIIm6+9RPRxG0qmEORMiAa3oUU4qh1zmqWO1G1fsuTtUfTrBeNRW/FZTzwjykohvq7JQSVgJKz3jJ0= 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 1730714103439325.85679240195554; Mon, 4 Nov 2024 01:55:03 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t7tn0-0002Vl-SF; Mon, 04 Nov 2024 04:54:26 -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 1t7tmz-0002VC-3l for qemu-devel@nongnu.org; Mon, 04 Nov 2024 04:54:25 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t7tmx-0002k2-DR for qemu-devel@nongnu.org; Mon, 04 Nov 2024 04:54:24 -0500 Received: from mx-prod-mc-04.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-314-P6wjTqE-PeuIaTtTNHKOXQ-1; Mon, 04 Nov 2024 04:54: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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2068A19560AE; Mon, 4 Nov 2024 09:54: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 D1FAF3000198; Mon, 4 Nov 2024 09:54:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1730714061; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1ZCdMFWAW+p9eCpAkQpTmJsY+P5AFLG61GLV7l5sZKw=; b=XcW5V4137CTT0pXioAq/YPbyaKoGGZzWD5CCRKotVfoiCh7pSp3ilHZuhq2fpwXJ9xtjii 0kTHUDbhhavcnx5xl+6gzABbjjSPLjRzRfRoSC7Ds7elKAydl7xrek6LAK3uN6kvor/Lqu h2ttOMSciisWXfp1K9QKOhhL3ocd7TE= X-MC-Unique: P6wjTqE-PeuIaTtTNHKOXQ-1 From: Michal Privoznik To: qemu-devel@nongnu.org Cc: michael.roth@amd.com, kkostiuk@redhat.com Subject: [PATCH 1/4] qga: Don't access global variable in run_agent_once() Date: Mon, 4 Nov 2024 10:54:07 +0100 Message-ID: <780bf01dec69fa68b8fe5a9c09187b124e0a56ec.1730713917.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 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.133.124; envelope-from=mprivozn@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.34, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_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: 1730714105657116600 Content-Type: text/plain; charset="utf-8" The run_agent_once() function is already given GAState via an argument. There's no need to access the global ga_state variable which points to the argument anyways (thanks to initialize_agent()). Worse, some parts of the function use the argument and the other use the global variable. Stick with the function argument. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- qga/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qga/main.c b/qga/main.c index 50186760bf..4a695235f0 100644 --- a/qga/main.c +++ b/qga/main.c @@ -1519,7 +1519,7 @@ static int run_agent_once(GAState *s) return EXIT_FAILURE; } =20 - g_main_loop_run(ga_state->main_loop); + g_main_loop_run(s->main_loop); =20 if (s->channel) { ga_channel_free(s->channel); --=20 2.45.2 From nobody Sat Nov 23 19:46:22 2024 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=1730714119; cv=none; d=zohomail.com; s=zohoarc; b=UtKtu4nrtKE87sePDrKe8+8Dyj2tK00ijSC3mn5GTAR6pcEEzgjlbkztjsSvG+rHqVoaeAhygDQHsYnqNOUZ1xGvQwECUzBZL9i2YMoiMy2SS+PWKUs47KSY+cPKr+eHheDb/fodgDh/7JmYpluem5ak6ibzokQHPJ2ir7x7DoQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1730714119; h=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=FHtrzReOa/j1KY02SZCyfWRb9w55Kdov5F5zFubNRVY=; b=Tt1qJ+TFuJnd6YJidEktHgyKnyC8s22s+6oO/AvQBObtgizHaLPXXRfkJ/Ryf8JOr1rz/vFlYF5fDLhLbix9kuG8PXklK/7fF1nLnPLysBrK4QWkZlecaxiO6YEaiz/H4fKFq8dsUyS+rJHKdPNFbcdIxrZ9Er9oBWFxA/Lqr80= 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 1730714119622921.3348132184826; Mon, 4 Nov 2024 01:55:19 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t7tn1-0002WA-OJ; Mon, 04 Nov 2024 04:54: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 1t7tmz-0002VA-0F for qemu-devel@nongnu.org; Mon, 04 Nov 2024 04:54:25 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t7tmx-0002jx-DK for qemu-devel@nongnu.org; Mon, 04 Nov 2024 04:54:24 -0500 Received: from mx-prod-mc-03.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-658-ae7mR26WNZ-mueoVNGoICw-1; Mon, 04 Nov 2024 04:54:19 -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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 83D3C1955F28; Mon, 4 Nov 2024 09:54:18 +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 675A8300018D; Mon, 4 Nov 2024 09:54:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1730714060; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FHtrzReOa/j1KY02SZCyfWRb9w55Kdov5F5zFubNRVY=; b=M82NGvVk7UYXtmxRYkmeTiKiNpGBYapfoB13ZaC/DLt4VFqGYRtDQmSFnh/JU4QljkebAi LcJfP1aR7lAL9j0ur/5qQ8aCHEwOElYeA+hu/SSHp3hEFBnt26D0LdlL1qkJz6r9VnI/yW IIqOe9hi99JHXF2sjOm057FkS+M+YVA= X-MC-Unique: ae7mR26WNZ-mueoVNGoICw-1 From: Michal Privoznik To: qemu-devel@nongnu.org Cc: michael.roth@amd.com, kkostiuk@redhat.com Subject: [PATCH 2/4] qga: Invert logic on return value in main() Date: Mon, 4 Nov 2024 10:54:08 +0100 Message-ID: <5182ceb139a43aacaab2c8b833bf52b13279dcf0.1730713917.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 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.133.124; envelope-from=mprivozn@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.34, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_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: 1730714121605116600 Content-Type: text/plain; charset="utf-8" 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 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/qga/main.c b/qga/main.c index 4a695235f0..c003aacbe0 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 --=20 2.45.2 From nobody Sat Nov 23 19:46:22 2024 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=1730714107; cv=none; d=zohomail.com; s=zohoarc; b=Xl5ob4aDlFBCZmDBkx/+g1Hy1lRUk9y9g8IpfXDY7iDXs1EEOyBHIx/cDdkC4Y4YTbQcpPSUq55QO2+x10BXI7obSNYWCIH9qJnmx7aJzYrBMTzJcrz/GY8Di8PS322PLuDhQ0KBMyJ5kurf8dUwm3OwLm2uuj/rlatEINOrXwM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1730714107; h=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=B9v8SCMDlF3R7yXlMspK48ptRVyriV+ZxTnL5VAk4Og=; b=Dx+Sc/wooHumX4O89Lq17yTSD344qGPTezrKH2YKg4FAlaGJ3FYM3cbZmV1eEIwSzfw7CFgZhm/sIKv6CgZocZB/qd7OCyR+8G9V3x4ZDzHldqPcMVDP29p3Xs8PGSGAMcNzRNPqq1wqCYKHHn6idGnr+UMditNYgtcco60ZllY= 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 1730714107523787.8771330868448; Mon, 4 Nov 2024 01:55:07 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t7tn4-0002Wn-I5; Mon, 04 Nov 2024 04:54: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 ) id 1t7tn1-0002W2-Dv for qemu-devel@nongnu.org; Mon, 04 Nov 2024 04:54:27 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t7tmz-0002l7-TX for qemu-devel@nongnu.org; Mon, 04 Nov 2024 04:54:27 -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-298-DfDBM4xFMwm_ULYFuPhdlg-1; Mon, 04 Nov 2024 04:54:21 -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 0FAC21956096; Mon, 4 Nov 2024 09:54:20 +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 E7EE0300019B; Mon, 4 Nov 2024 09:54:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1730714065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=B9v8SCMDlF3R7yXlMspK48ptRVyriV+ZxTnL5VAk4Og=; b=DklacSbBAjSg7iGhCw1y/oTRnVXYF5jfkWKxm6+r8ADe90ZEptOF6wIplAlgxvctGLU0Er vNg8oHbJjp7EP89kXlcIAzn5O2rsYs4PNt/DmnBy/dBy2TkmHupQnLCi1oqZDUXArUzBsd ekn6Zb8Ewz5wv1Saxlim4fgJxipj8Pk= X-MC-Unique: DfDBM4xFMwm_ULYFuPhdlg-1 From: Michal Privoznik To: qemu-devel@nongnu.org Cc: michael.roth@amd.com, kkostiuk@redhat.com Subject: [PATCH 3/4] qga: Don't daemonize before channel is initialized Date: Mon, 4 Nov 2024 10:54:09 +0100 Message-ID: <699917b7868f7fbae3c076f013850ba9f8a5cb8d.1730713917.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 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.133.124; envelope-from=mprivozn@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.34, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_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: 1730714109571116600 Content-Type: text/plain; charset="utf-8" If the agent is set to daemonize but for whatever reason fails to init the channel, the error message is lost. Worse, the agent daemonizes needlessly and returns success. For instance: # qemu-ga -m virtio-serial \ -p /dev/nonexistent_device \ -f /run/qemu-ga.pid \ -t /run \ -d # echo $? 0 This makes it needlessly hard for init scripts to detect a failure in qemu-ga startup. Though, they shouldn't pass '-d' in the first place. Let's open the channel first and only after that become a daemon. Related bug: https://bugs.gentoo.org/810628 Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- qga/main.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/qga/main.c b/qga/main.c index c003aacbe0..6240845f39 100644 --- a/qga/main.c +++ b/qga/main.c @@ -1430,7 +1430,6 @@ static GAState *initialize_agent(GAConfig *config, in= t socket_activation) if (config->daemonize) { /* delay opening/locking of pidfile till filesystems are unfro= zen */ s->deferred_options.pid_filepath =3D config->pid_filepath; - become_daemon(NULL); } if (config->log_filepath) { /* delay opening the log file till filesystems are unfrozen */ @@ -1438,9 +1437,6 @@ static GAState *initialize_agent(GAConfig *config, in= t socket_activation) } ga_disable_logging(s); } else { - if (config->daemonize) { - become_daemon(config->pid_filepath); - } if (config->log_filepath) { FILE *log_file =3D ga_open_logfile(config->log_filepath); if (!log_file) { @@ -1487,6 +1483,20 @@ static GAState *initialize_agent(GAConfig *config, i= nt socket_activation) =20 ga_apply_command_filters(s); =20 + if (!channel_init(s, s->config->method, s->config->channel_path, + s->socket_activation ? FIRST_SOCKET_ACTIVATION_FD : = -1)) { + g_critical("failed to initialize guest agent channel"); + return NULL; + } + + if (config->daemonize) { + if (ga_is_frozen(s)) { + become_daemon(NULL); + } else { + become_daemon(config->pid_filepath); + } + } + ga_state =3D s; return s; } @@ -1513,12 +1523,6 @@ static void cleanup_agent(GAState *s) =20 static int run_agent_once(GAState *s) { - if (!channel_init(s, s->config->method, s->config->channel_path, - s->socket_activation ? FIRST_SOCKET_ACTIVATION_FD : = -1)) { - g_critical("failed to initialize guest agent channel"); - return EXIT_FAILURE; - } - g_main_loop_run(s->main_loop); =20 if (s->channel) { --=20 2.45.2 From nobody Sat Nov 23 19:46:22 2024 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=1730714103; cv=none; d=zohomail.com; s=zohoarc; b=O8kElbsfc+aIwhJ2N3g8rkc1ml752NUaAqmk8s1WqF/6pUO9x/M0Fr/5AW/pXgxUXfZ7KDplPwIa7SfAbj5bynw1lU7VtPVLRH1VsCi+8gOSwDgSBSwKZ3vbZQM5V7qxyYeSZqyd9zCajX+H8MvX53G272h3EM5GAS5Evf7CDy4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1730714103; h=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=MBgza4hhP23Pb2M0lj59Qny3KhuoCZYtJwoGS3tsh8o=; b=DHvAlC+gnZdwJP9KMcmeV+UYxPiZetNQcFiYF6Md8GYbdE/WVi2j+h8YWzEMReZJTvN7sJ50zOMj4UFhsb6oiZHH4VpFtaPukLvxBlemRxou1LOBfKQuDEUjpriB5/+ZgmW2NqEe3CXeuJD+Yg/3cTx9/DeBLt3DFUr/e56ONhU= 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 1730714103887984.3365721383956; Mon, 4 Nov 2024 01:55:03 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t7tn7-0002XQ-2q; Mon, 04 Nov 2024 04:54:33 -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 1t7tn6-0002XI-Es for qemu-devel@nongnu.org; Mon, 04 Nov 2024 04:54:32 -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 1t7tn4-0002lo-UK for qemu-devel@nongnu.org; Mon, 04 Nov 2024 04:54:32 -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-387-iGXw1G8yPmm-SKUFGxPePg-1; Mon, 04 Nov 2024 04:54:23 -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 009C219560A2; Mon, 4 Nov 2024 09:54:22 +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 D9E51300018D; Mon, 4 Nov 2024 09:54:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1730714069; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MBgza4hhP23Pb2M0lj59Qny3KhuoCZYtJwoGS3tsh8o=; b=ITCM/QgU7tMg0oenm8w7HM7OEGFNZ5YB9Ftb7k6ENpBMG4mmwyvzNwWVIsFus8GyWkUdyQ HF8xJ2IYo5X0Xip3p9zIoz6dt5cU3AxmrJJE14QoANxDsZnd7IBYn+i6PHKT7F1aTV76aO pk/QOEI2VW1zF0wue7CS27jd3+yBJHw= X-MC-Unique: iGXw1G8yPmm-SKUFGxPePg-1 From: Michal Privoznik To: qemu-devel@nongnu.org Cc: michael.roth@amd.com, kkostiuk@redhat.com Subject: [PATCH 4/4] qga: Make run_agent() and run_agent_once() return no value Date: Mon, 4 Nov 2024 10:54:10 +0100 Message-ID: <36b6cfd879215f67ad92753a57565c14a64d8704.1730713917.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 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: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.34, 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_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_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: 1730714105743116600 Content-Type: text/plain; charset="utf-8" After previous commits, run_agent_once() can't return anything else but EXIT_SUCCESS. Transitionally, run_agent() can't return anything else but EXIT_SUCCESS too. There's not much value in having these function return an integer. Make them return void. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- qga/main.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/qga/main.c b/qga/main.c index 6240845f39..bcc182d64d 100644 --- a/qga/main.c +++ b/qga/main.c @@ -145,7 +145,7 @@ DWORD WINAPI service_ctrl_handler(DWORD ctrl, DWORD typ= e, LPVOID data, DWORD WINAPI handle_serial_device_events(DWORD type, LPVOID data); VOID WINAPI service_main(DWORD argc, TCHAR *argv[]); #endif -static int run_agent(GAState *s); +static void run_agent(GAState *s); static void stop_agent(GAState *s, bool requested); =20 static void @@ -1521,15 +1521,13 @@ static void cleanup_agent(GAState *s) ga_state =3D NULL; } =20 -static int run_agent_once(GAState *s) +static void run_agent_once(GAState *s) { g_main_loop_run(s->main_loop); =20 if (s->channel) { ga_channel_free(s->channel); } - - return EXIT_SUCCESS; } =20 static void wait_for_channel_availability(GAState *s) @@ -1553,21 +1551,17 @@ static void wait_for_channel_availability(GAState *= s) #endif } =20 -static int run_agent(GAState *s) +static void run_agent(GAState *s) { - int ret =3D EXIT_SUCCESS; - s->force_exit =3D false; =20 do { - ret =3D run_agent_once(s); + run_agent_once(s); if (s->config->retry_path && !s->force_exit) { g_warning("agent stopped unexpectedly, restarting..."); wait_for_channel_availability(s); } } while (s->config->retry_path && !s->force_exit); - - return ret; } =20 static void stop_agent(GAState *s, bool requested) @@ -1667,12 +1661,14 @@ int main(int argc, char **argv) { (char *)QGA_SERVICE_NAME, service_main }, { NULL, NULL } }; StartServiceCtrlDispatcher(service_table); } else { - ret =3D run_agent(s); + run_agent(s); } #else - ret =3D run_agent(s); + run_agent(s); #endif =20 + ret =3D EXIT_SUCCESS; + cleanup_agent(s); =20 end: --=20 2.45.2