From nobody Wed Apr 1 22:18:49 2026 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=1775043745; cv=none; d=zohomail.com; s=zohoarc; b=PDzOiywacJ/9E2OViXb4hkcaNE7/BRtMx+CqBYs1MxNoYefj3RkmaROm/DPfzxaRcZPfW51pUJ21E3xvUo1AQOohfPbo5H9yzWstzocdC9r9WGdVYcAce7t2bd+gUGJERzS9wWo1DxPdU2ui7v4Bq9/p5/jc9vAZcn//B0Y4G80= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775043745; 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=JSl0YtyiF+tLhOv8Z21hqrjAEWCf28iL+Fx6w3ef3Ls=; b=bAhcQos7Fr7dkEVsc59ISl2A58lH+T4NlWwSinEtjrY15A4myx9HBa3nwyIFWmsXgSxqAs6evCeUPplQ+JfvFa9B+W/7ZO+KCAI/cWlXIq4pYmMgicle6h3Pw7kboo1sy8LTQ8b+8AdU10KaEdGwVl3xqN29pBAUlevYoM0d40w= 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 1775043745932397.0719026314183; Wed, 1 Apr 2026 04:42:25 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id BE20D3F84A; Wed, 1 Apr 2026 07:42:24 -0400 (EDT) Received: from [172.19.199.12] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id B981F4190B; Wed, 1 Apr 2026 07:41:09 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id A51593F282; Wed, 1 Apr 2026 07:41:03 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 D8DEE3F310 for ; Wed, 1 Apr 2026 07:41:02 -0400 (EDT) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-544-2TRSn7zkNq2nvgktCHGtrw-1; Wed, 01 Apr 2026 07:41:01 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9CA0A1800625 for ; Wed, 1 Apr 2026 11:41:00 +0000 (UTC) Received: from moe (unknown [10.43.3.236]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 07A0A19560AB for ; Wed, 1 Apr 2026 11:40:59 +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=-1.8 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HELO_MISC_IP,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=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1775043662; 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=JSl0YtyiF+tLhOv8Z21hqrjAEWCf28iL+Fx6w3ef3Ls=; b=PUWCZBBBOGfk6v+XCFrKfwApB6AWw7eDAOvw3sHIHec7pIRHJyijSCMFcQ5iJT0B1FaOmt ynxewkiYwYGOEVJP2xVmPhMNhqnOcs3z9VMXsLVBB3vJtdbycem8+HVZa8ZAoeanJXyLmE eQf+UR1ca/n9MiJuz1rHt7D9NAHhMFs= X-MC-Unique: 2TRSn7zkNq2nvgktCHGtrw-1 X-Mimecast-MFC-AGG-ID: 2TRSn7zkNq2nvgktCHGtrw_1775043660 To: devel@lists.libvirt.org Subject: [PATCH v2 1/3] conf: Fix seclabel type parsing wrt default value Date: Wed, 1 Apr 2026 13:40:53 +0200 Message-ID: <1cfe56642b957e38ac9823fb5c7a7350c6ab8815.1775043601.git.mprivozn@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: sO_oh8Sv6jywIiRbj2WDppLvcD_bimDnhtT66EMUz4k_1775043660 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID-Hash: VEBLLNQFCG3P6HVCQ3UCQ4FUCXVJRZQC X-Message-ID-Hash: VEBLLNQFCG3P6HVCQ3UCQ4FUCXVJRZQC 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: 1775043748088158500 From: Michal Privoznik Prior to v7.10.0-rc1~26 seclabels defaulted to VIR_DOMAIN_SECLABEL_DYNAMIC (type=3D'dynamic'). But after switching the parser to virXMLPropEnum() the type is overwritten to VIR_DOMAIN_SECLABEL_DEFAULT because the first thing that the helper function does is to set variable that holds the result to zero. Switch to virXMLPropEnumDefault() to restore the previous behavior. Fixes: f7ff8556ad9ba8d81408e31649071941a6a849a3 Signed-off-by: Michal Privoznik Tested-by: Richard W.M. Jones Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 84425ff39d..b1ee519ff6 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7076,14 +7076,13 @@ virSecurityLabelDefParseXML(xmlXPathContextPtr ctxt, if (!(seclabel =3D virSecurityLabelDefNew(model))) return NULL; =20 - /* set default value */ - seclabel->type =3D VIR_DOMAIN_SECLABEL_DYNAMIC; - - if (virXMLPropEnum(ctxt->node, "type", - virDomainSeclabelTypeFromString, - VIR_XML_PROP_NONZERO, - &seclabel->type) < 0) + if (virXMLPropEnumDefault(ctxt->node, "type", + virDomainSeclabelTypeFromString, + VIR_XML_PROP_NONZERO, + &seclabel->type, + VIR_DOMAIN_SECLABEL_DYNAMIC) < 0) { return NULL; + } =20 if (seclabel->type =3D=3D VIR_DOMAIN_SECLABEL_STATIC || seclabel->type =3D=3D VIR_DOMAIN_SECLABEL_NONE) --=20 2.52.0