From nobody Fri Dec 27 12:08:55 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 1732634339735426.5564010089711; Tue, 26 Nov 2024 07:18:59 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 9D6E51B7A; Tue, 26 Nov 2024 10:18:58 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id D3C721C4A; Tue, 26 Nov 2024 10:17:16 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 6DA4F1B3D; Tue, 26 Nov 2024 10:17:10 -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 61BCE1BFB for ; Tue, 26 Nov 2024 10:16:57 -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-198-2SLQSpcvNsqRa7KHraPQtQ-1; Tue, 26 Nov 2024 10:16:54 -0500 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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 7837918F0F9C for ; Tue, 26 Nov 2024 15:16:33 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.6]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id F3043196BC2B for ; Tue, 26 Nov 2024 15:16:31 +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_H3,RCVD_IN_MSPIKE_WL,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=1732634217; 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=0uFDLQaoOMINUThk5p0+4uodTeMPSrYpekWQy/o8B5I=; b=ZN1KMJ/SI2S8jB9RQh7z9tU4liIKndFKqN2gcgyL0vCPmQy0efswg/kebKGXMtuT0/X640 bWKwnGcf9XQvjlOV0qgbH8+veDwKvO7tSRx8JtGNY70w4vmaQtHTFwZeb9xagWKRS0DVrb jp6n5gGu6ggIjfHeQW1zgIuiuwqyX2w= X-MC-Unique: 2SLQSpcvNsqRa7KHraPQtQ-1 X-Mimecast-MFC-AGG-ID: 2SLQSpcvNsqRa7KHraPQtQ From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 7/8] qemuDomainVirStorageSourceFindByNodeName: Match also '' sources Date: Tue, 26 Nov 2024 16:16:18 +0100 Message-ID: <89950b54ac19a3639e8caa1d8ac2b59204cdb8c2.1732633990.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 7OfyQCKqWnnMbVgAT3MrcTQWCsQb-LDgmzkmfbl8qaw_1732634213 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: NZMRPNC5KVY2F7QR3IFPEG43IY32R6FX X-Message-ID-Hash: NZMRPNC5KVY2F7QR3IFPEG43IY32R6FX X-MailFrom: pkrempa@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: 1732634342197019100 Content-Type: text/plain; charset="utf-8" As the source for the data file is a completely separate virStorageSource including it's own index we need to match it explicitly, so that code such as storage threshold events work properly and separately for the data file. Signed-off-by: Peter Krempa --- src/qemu/qemu_domain.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 150f0736f3..4499fed6bc 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2921,6 +2921,10 @@ qemuDomainVirStorageSourceFindByNodeName(virStorageS= ource *top, for (tmp =3D top; virStorageSourceIsBacking(tmp); tmp =3D tmp->backing= Store) { if (qemuDomainVirStorageSourceMatchNodename(tmp, nodeName)) return tmp; + + if (tmp->dataFileStore && + qemuDomainVirStorageSourceMatchNodename(tmp->dataFileStore, no= deName)) + return tmp->dataFileStore; } return NULL; --=20 2.47.0