From nobody Mon Sep 16 19:12:21 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 171863235434362.714228222952784; Mon, 17 Jun 2024 06:52:34 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 2D9941309; Mon, 17 Jun 2024 09:52:33 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 7A37812E7; Mon, 17 Jun 2024 09:52:19 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 0754A12CA; Mon, 17 Jun 2024 09:52:16 -0400 (EDT) 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 9DA9E12C9 for ; Mon, 17 Jun 2024 09:52:15 -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-194-cSoaM8hLMWWxPr9KkQcLMw-1; Mon, 17 Jun 2024 09:52:13 -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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 81808195608B for ; Mon, 17 Jun 2024 13:52:11 +0000 (UTC) Received: from ajulis-thinkpadt14gen4.remote.csb (unknown [10.43.3.76]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B4FCE19560AE for ; Mon, 17 Jun 2024 13:52:10 +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, T_SCC_BODY_TEXT_LINE 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=1718632335; 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=hDt34kMLBIk+uD37n9/ZBJOuvZ4d5SxM9mVsKdrmsIk=; b=B8CMXXFzSlFTY+duCKVMqL0UAUelSh1P3zWWZtH57LsZ8rg1icaWXG08bVnItebpFF+NXU VXI43kcaUsWYieinOVxM+ww6O1gRht6uJlDr6aJSPjCCEJiMPHMZUPnsShT1tnvj/lj/cb nu749yj/hV9lTHX5GDRJ6ZONNKx1AtI= X-MC-Unique: cSoaM8hLMWWxPr9KkQcLMw-1 From: Adam Julis To: devel@lists.libvirt.org Subject: [PATCH] conf: add validation of potential dependencies Date: Mon, 17 Jun 2024 15:51:53 +0200 Message-ID: <07e3c9272c3a82366431feb473b4b9f36d81f8f4.1718632227.git.ajulis@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: R5BT46J752VYSRA4FHTSI56AKETQLOYN X-Message-ID-Hash: R5BT46J752VYSRA4FHTSI56AKETQLOYN X-MailFrom: ajulis@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: 1718632356112100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Although existing virDomainDefPostParse is called after modifying the XML and it contains validating process for changed device, the virDomainDefValidate function performs a more comprehensive check. It should detect errors resulting from dependencies between devices. Therefore, the virDomainDefValidate is added at the end. Signed-off-by: Adam Julis Reviewed-by: Michal Privoznik --- src/qemu/qemu_driver.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e2698c7924..67b9778c67 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6869,6 +6869,9 @@ qemuDomainAttachDeviceConfig(virDomainDef *vmdef, if (virDomainDefPostParse(vmdef, parse_flags, xmlopt, qemuCaps) < 0) return -1; =20 + if (virDomainDefValidate(vmdef, parse_flags, xmlopt, qemuCaps) < 0) + return -1; + return 0; } =20 --=20 2.44.0