From nobody Sun Feb 8 23:30: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=1725719705; cv=none; d=zohomail.com; s=zohoarc; b=d7MbRP7Dln81P2PcdCU5gjrPouT4PftRVwnMVsi81mebq5C4AwM3gA7brtLdzuoFPhmKqMd8Vzg1fEiwyFK60ay4kV+Cx2p7WvBELyuiHmNddBLvAbbBDqEr+NL9D/YTlRE08vEG+Nrmg/NmFXFQ3VI3nqgKt5bJWaB3YwShzzA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1725719705; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id; bh=RxmrQ+KJWE/sthRw5wJ+CVy9n8LKc4s00qwOPXC7fT8=; b=NhJDU6IvDjvfiFGJcKQKZYPCdMB0STk22slEvxSFOAeMvF0gddMzM36NQgrNToFFnRxBcIwLr8h6j5GRWZHOeYLlGvsEIXPR0Z67Tap13hfZgG8qCFCY+9k22gNH3ewkyizyr4HbAPAUEF1jMZGRqOusEetYPLEG+zG9HHgzgIk= 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 1725719705362838.0713571818676; Sat, 7 Sep 2024 07:35:05 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 59667195F; Sat, 7 Sep 2024 10:35:04 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 982C91952; Sat, 7 Sep 2024 10:33:27 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id A902218A9; Sat, 7 Sep 2024 10:33:20 -0400 (EDT) Received: from relay.virtuozzo.com (relay.virtuozzo.com [130.117.225.111]) (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 7EE71185C for ; Sat, 7 Sep 2024 10:33:04 -0400 (EDT) Received: from [130.117.225.1] (helo=vz9-barybin-2.ch-qa.vzint.dev) by relay.virtuozzo.com with esmtp (Exim 4.96) (envelope-from ) id 1smwRe-001ZxE-2L; Sat, 07 Sep 2024 16:32:17 +0200 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuozzo.com; s=relay; h=MIME-Version:Message-ID:Date:Subject:From: Content-Type; bh=eSiKg+JKNjBhG8eDas3sI17oJKQT4cpBjJguDIzRYmU=; b=jFQn1MBObscu /FjLYE4hF8ajGL/cBKOstoV7x8aDKxPcG3vOcMPBXKGsiYMO/gD7H1WTiWPb5h1OnGuNnS6MO2bAu jnuqU7HIbghQa4pong7RgRnGZplRQkOzd3sEB0PE8tS5fxowyBIMBtEBvCAAp3chZ5PhQHqUQgGkm v7t/7JWpFmK7EYHbSUgGBZWm0H3ylR2oHfVhdU5eNkAxZKMAPF301Ap9eMGmpiGgR92RYUdJbvWPn Iii1ieuJESbLsZaM7Z5ojq+btiRnAsMfHcNXP8KO+mVLzpqmcgl8q21Ld7x227+zBRx1ndRQ4FRMn cVjUfbgnmKvcxxj6mrP33A==; To: devel@lists.libvirt.org Subject: [PATCH v2 10/13] qemu: enable basic qcow2 data-file feature support Date: Sat, 7 Sep 2024 17:15:35 +0300 Message-ID: <20240907143006.50677-21-nikolai.barybin@virtuozzo.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20240907143006.50677-1-nikolai.barybin@virtuozzo.com> References: <20240907143006.50677-1-nikolai.barybin@virtuozzo.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: KS2MQ23WM3SP74QZ2MTN7WK5UGSGSTWG X-Message-ID-Hash: KS2MQ23WM3SP74QZ2MTN7WK5UGSGSTWG X-MailFrom: nikolai.barybin@virtuozzo.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 CC: den@openvz.org, Nikolai Barybin 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: From: Nikolai Barybin via Devel Reply-To: Nikolai Barybin X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1725719707373116600 Content-Type: text/plain; charset="utf-8" - propogate data-file to cmdline - determine data-file within disk chain - enable live disk insertion Signed-off-by: Nikolai Barybin --- src/qemu/qemu_block.c | 7 +++++++ src/qemu/qemu_command.c | 5 +++++ src/qemu/qemu_domain.c | 14 +++++++++++++- 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 6e90bae9f2..5d2a638a56 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -1301,6 +1301,13 @@ qemuBlockStorageSourceGetFormatQcow2Props(virStorage= Source *src, NULL) < 0) return -1; =20 + if (src->dataFileStore) { + if (virJSONValueObjectAdd(&props, + "s:data-file", src->dataFileStore->noden= ameformat, + NULL) < 0) + return -1; + } + return 0; } =20 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1b992d8eed..503374f470 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -11178,6 +11178,11 @@ qemuBuildStorageSourceChainAttachPrepareBlockdev(v= irStorageSource *top) if (qemuBuildStorageSourceChainAttachPrepareBlockdevOne(data, n, n->backing= Store) < 0) return NULL; + + if (n->dataFileStore && + qemuBuildStorageSourceChainAttachPrepareBlockdevOne(data, n->d= ataFileStore, + n->dataFil= eStore->backingStore) < 0) + return NULL; } =20 return g_steal_pointer(&data); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 86362393e2..0555bc8cfd 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8102,9 +8102,17 @@ qemuDomainDetermineDiskChain(virQEMUDriver *driver, true) < 0) return -1; =20 + if (src->dataFileStore && + qemuDomainPrepareStorageSource(src->dataFileStore, vm, disk, cfg) = < 0) + return -1; + for (n =3D src->backingStore; virStorageSourceIsBacking(n); n =3D n->b= ackingStore) { if (qemuDomainPrepareStorageSource(n, vm, disk, cfg) < 0) return -1; + + if (n->dataFileStore && + qemuDomainPrepareStorageSource(n->dataFileStore, vm, disk, cfg= ) < 0) + return -1; } =20 if (qemuDomainStorageSourceValidateDepth(disksrc, 0, disk->dst) < 0) @@ -11298,7 +11306,7 @@ qemuDomainPrepareDiskSourceData(virDomainDiskDef *d= isk, return; =20 /* transfer properties valid only for the top level image */ - if (src =3D=3D disk->src) + if (src =3D=3D disk->src || src =3D=3D disk->src->dataFileStore) src->detect_zeroes =3D disk->detect_zeroes; =20 /* transfer properties valid for the full chain */ @@ -11527,6 +11535,10 @@ qemuDomainPrepareDiskSourceBlockdev(virDomainDiskD= ef *disk, for (n =3D disk->src; virStorageSourceIsBacking(n); n =3D n->backingSt= ore) { if (qemuDomainPrepareStorageSourceBlockdev(disk, n, priv, cfg) < 0) return -1; + + if (n->dataFileStore && + qemuDomainPrepareStorageSourceBlockdev(disk, n->dataFileStore,= priv, cfg) < 0) + return -1; } =20 return 0; --=20 2.43.5