From nobody Fri Dec 27 11:26:06 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 1732634394850823.4296853273094; Tue, 26 Nov 2024 07:19:54 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 2794DB14; Tue, 26 Nov 2024 10:19:54 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 17F711C73; Tue, 26 Nov 2024 10:17:27 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id BEB0E1910; Tue, 26 Nov 2024 10:17:19 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 EE24F1BCB for ; Tue, 26 Nov 2024 10:17:02 -0500 (EST) Received: from mx-prod-mc-04.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-677-jMAEMcrjOa6UBWD-KCFr9w-1; Tue, 26 Nov 2024 10:17:01 -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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E472518DB7C1 for ; Tue, 26 Nov 2024 15:16:35 +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 6DD96196BEA9 for ; Tue, 26 Nov 2024 15:16:33 +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=-1.7 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=1732634222; 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=N8V04PmiLWxGG52+ywmRs9DG0m36edSg+M/3dHrWyJo=; b=E7wOdVOg5KFHwvr7/3ppt2XSjG2/UNlxBJlbFNdYd8SOWoamnxdEpr9nyYY6JNKmqR2SmI SNKfbXvv9ErXnlIPftpJtP/KUh7Kji2GjuM3gTsPTUbvvppSVRAIiocz8Rn8myZPWURnjC Zs6k5YIkYU1kwfuwQErTif4ci/xPwrk= X-MC-Unique: jMAEMcrjOa6UBWD-KCFr9w-1 X-Mimecast-MFC-AGG-ID: jMAEMcrjOa6UBWD-KCFr9w From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 8/8] qemuDomainGetStorageSourceByDevstr: Lookup also '' Date: Tue, 26 Nov 2024 16:16:19 +0100 Message-ID: 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: mYdqfYo81Qs9Qdo6CU87jdSeR7PAXMctvZDKmCJRVeA_1732634220 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: LAAQOWIVVK7JHEQQE53MGNUQ3QGCUVJC X-Message-ID-Hash: LAAQOWIVVK7JHEQQE53MGNUQ3QGCUVJC 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: 1732634396569019100 Content-Type: text/plain; charset="utf-8" The volumes have their own 'id' so we need to be able to look them up for the given image chain. Signed-off-by: Peter Krempa --- src/qemu/qemu_domain.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 4499fed6bc..1fc4e2f33f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9260,12 +9260,18 @@ qemuDomainGetStorageSourceByDevstr(const char *devs= tr, for (n =3D disk->src; virStorageSourceIsBacking(n); n =3D n->backingSt= ore) { if (n->id =3D=3D idx) return n; + + if (n->dataFileStore && n->dataFileStore->id =3D=3D idx) + return n->dataFileStore; } if (disk->mirror) { for (n =3D disk->mirror; virStorageSourceIsBacking(n); n =3D n->ba= ckingStore) { if (n->id =3D=3D idx) return n; + + if (n->dataFileStore && n->dataFileStore->id =3D=3D idx) + return n->dataFileStore; } } @@ -9281,6 +9287,9 @@ qemuDomainGetStorageSourceByDevstr(const char *devstr, for (n =3D backupdisk->store; virStorageSourceIsBacking(n); n = =3D n->backingStore) { if (n->id =3D=3D idx) return n; + + if (n->dataFileStore && n->dataFileStore->id =3D=3D idx) + return n->dataFileStore; } } } --=20 2.47.0