From nobody Fri Dec 19 22:07:35 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1742486807; cv=none; d=zohomail.com; s=zohoarc; b=G+JZj3BAak92ATrnilwPqcz527iAt8E63iPjjYnfpTiGMT2ci7y6K1h2Wpve0Yzxh/5sPZHG0IWRLCkuaG0pFUTyMPLH0Lqa2ZytyY7/OvH96psv1tJvBawdc4X9Olds0dq/KJIh7rJ/uAYjl849gC8ZnEcQP5sXl8LYEMeLRbw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742486807; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=goezSB4YSdbTOMFIbXzPEzyhhYdKB3BtT411f6Yxs38=; b=hLkZykGcZPVt549l65ptFZ63MFzJG7fpndRoSVuby4rOcQnSU16qMUCKVHybKPkEjgpHNrPM2uWJ7wcwqb2JbjzsHCr03zIDtLITYHIb2wSkS2cojDfOVjzfsT2yaSz2nSTwWh+xOBtsZVkGY3TKRPU9iU0FqFaGD6LdfgNCN5U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1742486807928500.736607803336; Thu, 20 Mar 2025 09:06:47 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 012FC1773; Thu, 20 Mar 2025 12:06:46 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id D554214F4; Thu, 20 Mar 2025 12:04:45 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id AE41B15D8; Thu, 20 Mar 2025 12:04:37 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id CFB0A15A7 for ; Thu, 20 Mar 2025 12:04:26 -0400 (EDT) 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-657-kJuFbKPrOlmp6ceL21THkw-1; Thu, 20 Mar 2025 12:04:18 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 F239519373D7 for ; Thu, 20 Mar 2025 16:04:17 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.6]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2596519373C4 for ; Thu, 20 Mar 2025 16:04:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1742486661; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4TusvmdghCyy2mkJdfc21kiHfmg9bquJq2aInnV2aqE=; b=QFq//3JTre+uRHpZGa07qtSrdjvkOs7Y1TQHHOt42uJfTCXYLou5zBB7T7sIMx/J52ObjF vCf7pBMNo0DlLMjmwBlRJ/L5d4RydhERupMJNDD2IkYyBcGDUSiBhvKGoGMxutDXRmV1F8 0EkKXvsBCwbJgiCahQm5en/aziigV78= X-MC-Unique: kJuFbKPrOlmp6ceL21THkw-1 X-Mimecast-MFC-AGG-ID: kJuFbKPrOlmp6ceL21THkw_1742486658 To: devel@lists.libvirt.org Subject: [PATCH 7/8] qemuAgentCheckError: Rewort error if neither return nor error is found Date: Thu, 20 Mar 2025 17:04:04 +0100 Message-ID: <4be7ca9bfb78519a88164820fe7d364914048876.1742486492.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: QrHgYAMvY_RS-KMB3WDN3WlkhCLBCM_HihdWcePsrrM_1742486658 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 6CPN575MOZPBW5B3EETY3VZ2NG4IFWJQ X-Message-ID-Hash: 6CPN575MOZPBW5B3EETY3VZ2NG4IFWJQ X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1742486809971019100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Disambiguate the case from other types of error. Signed-off-by: Peter Krempa --- src/qemu/qemu_agent.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index d4eb4897a4..ee0921eca6 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -1013,7 +1013,7 @@ qemuAgentCheckError(virJSONValue *cmd, VIR_DEBUG("Neither 'return' nor 'error' is set in the JSON reply %= s: %s", NULLSTR(cmdstr), NULLSTR(replystr)); virReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to execute QEMU agent command '%1$s'"), + _("QEMU agent command '%1$s' returned neither error= nor success"), qemuAgentCommandName(cmd)); return -1; } --=20 2.48.1