From nobody Tue Dec 16 16:57:20 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=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 1740088924108736.1462741080113; Thu, 20 Feb 2025 14:02:04 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 7FD56930; Thu, 20 Feb 2025 17:02:03 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id A59EA226F; Thu, 20 Feb 2025 17:00:46 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 558062223; Thu, 20 Feb 2025 17:00:42 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 959682184 for ; Thu, 20 Feb 2025 17:00:33 -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-564-ezbIA0RENLiq8TtTRAthNA-1; Thu, 20 Feb 2025 17:00:30 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 EDA7419560AF for ; Thu, 20 Feb 2025 22:00:29 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.44.32.8]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2019E1800D9F for ; Thu, 20 Feb 2025 22:00:28 +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_H2,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=1740088833; 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=RKd5Xmegw3pgnkVOzSpuF3jlrbSVv6QYy7jZx/uY9gQ=; b=GZG/MRO+MLFZEQXN2256wnvzeeoFLJ3FFg6hN3rUm6Zd8kn+Dv+ofXWtkZK+tDaGm2D4Cs wgBE8XdN9g8vi7glag9w+9U8ttb4rUXAY6Y9AB3t7V0LHe+K8TIvTv3l0R/TJCEp4z9kYH hxBexm3mwyf1ThvWstBxPIpTpTL1mN8= X-MC-Unique: ezbIA0RENLiq8TtTRAthNA-1 X-Mimecast-MFC-AGG-ID: ezbIA0RENLiq8TtTRAthNA_1740088830 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: devel@lists.libvirt.org Subject: [libvirt PATCHv1 4/4] conf: metadata: remove metadata node if all metadata is removed Date: Thu, 20 Feb 2025 22:59:26 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: C3_6lc_x6sz-cjQua4sK_mmwhEiW0BHah983Zqfix4o_1740088830 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: XBN4CNRWDHBNDTQE4MJWJNNR7VECGT4C X-Message-ID-Hash: XBN4CNRWDHBNDTQE4MJWJNNR7VECGT4C X-MailFrom: jtomko@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: 1740088926169019000 Content-Type: text/plain; charset="utf-8" When removing the last child element from a network or domain metadata, free the metadata node itself as well, to prevent displaying an empty metadata element. https://issues.redhat.com/browse/RHEL-27172 Signed-off-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 3 +++ src/conf/virnetworkobj.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6ca604a60b..50763d9514 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -30264,6 +30264,9 @@ virDomainDefSetMetadata(virDomainDef *def, return -1; } new =3D NULL; + } else if (!xmlFirstElementChild(def->metadata)) { + xmlFreeNode(def->metadata); + def->metadata =3D NULL; } break; =20 diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index 7d4566bdf1..c908c61e67 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -2117,6 +2117,9 @@ virNetworkDefSetMetadata(virNetworkDef *def, return -1; } new =3D NULL; + } else if (!xmlFirstElementChild(def->metadata)) { + xmlFreeNode(def->metadata); + def->metadata =3D NULL; } break; =20 --=20 2.48.1