From nobody Fri Oct 18 08:51:42 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 1719309220240770.3123895208698; Tue, 25 Jun 2024 02:53:40 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 3D2E9BA2; Tue, 25 Jun 2024 05:53:39 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id ECEAD1448; Tue, 25 Jun 2024 05:49:38 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 4C64713C8; Tue, 25 Jun 2024 05:49:26 -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 04EA713F8 for ; Tue, 25 Jun 2024 05:49:08 -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-553-bDopsmaVOXigPsF3kGTMqQ-1; Tue, 25 Jun 2024 05:49:01 -0400 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 E89C019560B2 for ; Tue, 25 Jun 2024 09:48:59 +0000 (UTC) Received: from maggie.brq.redhat.com (unknown [10.43.3.102]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 32B22300021A for ; Tue, 25 Jun 2024 09:48:58 +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=3.0 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,RCVD_IN_SBL_CSS,SPF_HELO_NONE autolearn=no autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1719308948; 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=FfEIkBtZDUQVNR7EkFQ6mXiw4K7Kcs2XLQtJ3IicUEM=; b=cQxOIj0jkcMbUR1ojm2ig6yyY1n215YQFSykTchhWRgvTHzR8PvpeKS23RZmhJnN0EL97o H2/N48eJ7CFNcGbCYdJU1EfwCLAR1MmvWcu4BhRKyhSrWnfOh1RZs/9/plCBZB+lj5aPYm Q5tTWHA2GE1jreypfoMHd+RnDQ38yQ4= X-MC-Unique: bDopsmaVOXigPsF3kGTMqQ-1 From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH 3/8] qemu_capabilities: Probe SEV capabilities even for QEMU_CAPS_SEV_SNP_GUEST Date: Tue, 25 Jun 2024 11:48:48 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: P4F7ZLL5W3RST7MIS4CWIVKMOQNXU7YP X-Message-ID-Hash: P4F7ZLL5W3RST7MIS4CWIVKMOQNXU7YP 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: 1719309221084100001 Content-Type: text/plain; charset="utf-8"; x-default="true" While it's very unlikely to have QEMU that supports SEV-SNP but doesn't support plain SEV, for completeness sake we ought to query SEV capabilities if QEMU supports either. And similarly to QEMU_CAPS_SEV_GUEST we need to clear the capability if talking to QEMU proves SEV is not really supported. This in turn removes the 'sev-snp'guest' capability from on of our test cases as Peter's machine he uses to refresh capabilities is not SEV capable. But that's okay. It's consistent with 'sev-guest' capability. Signed-off-by: Michal Privoznik --- src/qemu/qemu_capabilities.c | 4 +++- tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index fe704d16dd..adaf5f9c26 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3465,7 +3465,8 @@ virQEMUCapsProbeQMPSEVCapabilities(virQEMUCaps *qemuC= aps, int rc =3D -1; virSEVCapability *caps =3D NULL; =20 - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SEV_GUEST)) + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SEV_GUEST) && + !virQEMUCapsGet(qemuCaps, QEMU_CAPS_SEV_SNP_GUEST)) return 0; =20 if ((rc =3D qemuMonitorGetSEVCapabilities(mon, &caps)) < 0) @@ -3474,6 +3475,7 @@ virQEMUCapsProbeQMPSEVCapabilities(virQEMUCaps *qemuC= aps, /* SEV isn't actually supported */ if (rc =3D=3D 0) { virQEMUCapsClear(qemuCaps, QEMU_CAPS_SEV_GUEST); + virQEMUCapsClear(qemuCaps, QEMU_CAPS_SEV_SNP_GUEST); return 0; } =20 diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_9.1.0_x86_64.xml index a9973a0913..e0332ce1e8 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml @@ -203,7 +203,6 @@ - 9000050 43100246 v9.0.0-1388-g80e8f06021-dirty --=20 2.44.2