From nobody Mon Sep 16 19:07:14 2024 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1720684394240921.3383024184413; Thu, 11 Jul 2024 00:53:14 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 11DF9DC6; Thu, 11 Jul 2024 03:53:13 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 5BB81D59; Thu, 11 Jul 2024 03:52:57 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 3AA33D55; Thu, 11 Jul 2024 03:52:54 -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 C37EFA92 for ; Thu, 11 Jul 2024 03:52:53 -0400 (EDT) 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-215-Bgq1Uq7fMsqpnEBncb7WsA-1; Thu, 11 Jul 2024 03:52:52 -0400 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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 37A8719560A2 for ; Thu, 11 Jul 2024 07:52:51 +0000 (UTC) Received: from maggie.brq.redhat.com (unknown [10.43.3.102]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5E08D1954217 for ; Thu, 11 Jul 2024 07:52:50 +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, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,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=1720684373; 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; bh=qRW3dTLwcHIlmuAEj2AhwRRnmFcvkjvDNrTLYJK3KLU=; b=Z0QICawinQ7jCRc2NKW5SQhKHLYNb26d0l4WdhmfnPmisU39BEXIraQOLuXScFsWv8Elsp RyWpeXZn9Rdpe0pMLbBskcuUIshZU0Mesm7Vg9KD9IfGvok21r0RE+mMLnN91NgGjyjEOe jD7AFD0yEMR0ynguNzgo6mkF1e/boQI= X-MC-Unique: Bgq1Uq7fMsqpnEBncb7WsA-1 From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH] virt-host-validate: Drop extra "PASS" Date: Thu, 11 Jul 2024 09:52:48 +0200 Message-ID: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: P64B4FZBUXAE54RHRWJ2H2ICIFGHUM3E X-Message-ID-Hash: P64B4FZBUXAE54RHRWJ2H2ICIFGHUM3E X-MailFrom: mprivozn@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: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1720684395383116600 Content-Type: text/plain; charset="utf-8"; x-default="true" If virt-host-validate is ran on a SEV-SNP capable machine, an extra "PASS" is printed out. This is because virHostValidateAMDSev() prints "PASS" and then returns 1 (indicating success) which in turn makes the caller (virHostValidateSecureGuests()) print "PASS" again. Just drop the extra printing in the caller and let virHostValidateAMDSev() do all the printing. Fixes: 1a8f646f291775d2423ce4e4df62ad69f06ab827 Resolves: https://issues.redhat.com/browse/RHEL-46868 Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- tools/virt-host-validate-common.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-c= ommon.c index a29a5b6d5f..86db4815c3 100644 --- a/tools/virt-host-validate-common.c +++ b/tools/virt-host-validate-common.c @@ -488,11 +488,7 @@ int virHostValidateSecureGuests(const char *hvname, return VIR_VALIDATE_FAILURE(level); } } else if (hasAMDSev) { - int rc =3D virHostValidateAMDSev(hvname, level); - - if (rc > 0) - virValidatePass(); - return rc; + return virHostValidateAMDSev(hvname, level); } =20 virValidateFail(level, --=20 2.44.2