From nobody Fri Nov 21 10:11:04 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=1762764249; cv=none; d=zohomail.com; s=zohoarc; b=NpVI72RDlzkrYHWq1R8ZhKjdc2uHXJpgsEIy7OGxXqtw1YD3IL6bnCiehyMdKNNbwg6gOPLrRC2OW4mY9LrgH6uIn5lXKAOj33RVXAla85GU0Ewvf17T0S1q5661YEHQfQfRiPP9Xfdm4jInI62X08alG64laMni/JxM5xe3ptw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1762764249; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner: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=lD5VuTGDwgIR7G0u8TcJ4YDVoCYRXLLofrldTy9kbwE=; b=f+JM0HjiBJSP6w8LQpryRnWPIR55JgkPjZXDhMchdkuqD6vtPARuoSwClPE1WOFyTXzdziPmOQiFztZ+lur5OdmUSfKrEf3cXngSUJ3I2hL2ErVJnbC+A4yYvqSxOTafXffSsAgt/B1/JZIk44OFoDTL/ryClQgIqkJzswYFyuI= 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 1762764249260499.81310874708583; Mon, 10 Nov 2025 00:44:09 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 5497144279; Mon, 10 Nov 2025 03:44:08 -0500 (EST) Received: from [172.19.199.29] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 0D697449C0; Mon, 10 Nov 2025 03:40:23 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 4D07144230; Mon, 10 Nov 2025 03:40:04 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id B1C3644230 for ; Mon, 10 Nov 2025 03:40:00 -0500 (EST) 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-241-bJ96Dfw3M_WafxdhCzxMbQ-1; Mon, 10 Nov 2025 03:39:58 -0500 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 01F5F195608E for ; Mon, 10 Nov 2025 08:39:58 +0000 (UTC) Received: from moe (unknown [10.43.3.236]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 435E21800451 for ; Mon, 10 Nov 2025 08:39:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1762764000; 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=lD5VuTGDwgIR7G0u8TcJ4YDVoCYRXLLofrldTy9kbwE=; b=PB5SwqeIR/YGVvItUmyPNmoE6mUOKQI/qwlPUcr7DqGetZhhuWsHrj2FNxY5IEL3zdjfLG ZeIerCQJCJrV9JcJK3etqDi6bsiPQH59gvfcs8TqJ+zxHi7xrqKtZVVhv0K0wShlbJoPEi vV7y0h4qM1ueTMBfZ2W9vJDJOPnW1dU= X-MC-Unique: bJ96Dfw3M_WafxdhCzxMbQ-1 X-Mimecast-MFC-AGG-ID: bJ96Dfw3M_WafxdhCzxMbQ_1762763998 To: devel@lists.libvirt.org Subject: [PATCH 4/5] domain_capabilities: Check NULL in FORMAT_PROLOGUE Date: Mon, 10 Nov 2025 09:39:49 +0100 Message-ID: <2a144eff69c21b493ea83ee5b869670b77d7c082.1762763958.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: XtKMe6_8aIE25I7gt53VBC7qBFBMAdpER--T47zZX4g_1762763998 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: ORKR72T5MO2JB7OUGHUR4EGTJNCC7NIZ X-Message-ID-Hash: ORKR72T5MO2JB7OUGHUR4EGTJNCC7NIZ X-MailFrom: mprivozn@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Michal Privoznik via Devel Reply-To: Michal Privoznik X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1762764250330158500 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Michal Privoznik In the virDomainCaps struct there are some pointers that might be NULL (for instance 'sev', 'sgx', 'hyperv'). Teach FORMAT_PROLOGUE macro to check for NULL argument so that format functions (like virDomainCapsFeatureHypervFormat()) don't need to. Signed-off-by: Michal Privoznik Reviewed-by: Peter Krempa --- src/conf/domain_capabilities.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index 1c69a05685..78a5b1f56a 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -375,7 +375,7 @@ virDomainCapsStringValuesFormat(virBuffer *buf, =20 #define FORMAT_PROLOGUE(item) \ do { \ - if (item->supported =3D=3D VIR_TRISTATE_BOOL_ABSENT) \ + if (!item || item->supported =3D=3D VIR_TRISTATE_BOOL_ABSENT) \ return; \ virBufferAsprintf(buf, "<" #item " supported=3D'%s'%s\n", \ (item->supported =3D=3D VIR_TRISTATE_BOOL_YES) ? "yes" : "= no", \ @@ -818,9 +818,6 @@ virDomainCapsFeatureHypervFormat(virBuffer *buf, { virBuffer defaults =3D VIR_BUFFER_INIT_CHILD(buf); =20 - if (!hyperv) - return; - FORMAT_PROLOGUE(hyperv); =20 ENUM_PROCESS(hyperv, features, virDomainHypervTypeToString); --=20 2.51.0