From nobody Sun Feb 8 18:03:57 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=1725719645; cv=none; d=zohomail.com; s=zohoarc; b=CGGe8p8Gz2QBvcJoRC0a+Ny4MpnQtQro5hcOQlq2aEs9MWxOnvoy8I/tMx8y2cORfCZ1Z7SzHlXwEfKACLAfy9d+goj5cxAxGGZ+xfV45vBR0t62Rte+VS2ok8k7UdWkxoKMI0v51Vs6AVmsV0zIYW+qWcrAX4UVfnxZzH0Ex/c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1725719645; 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=A7gepbhcwcFT3ASGl8X/8uljDI639qK7MI8IpRKoukQ=; b=QsXZGhleb2Vuz+eTnsUf5EenRHeyJkrK6ZPr9FcyVwy5Smu8ZKhZPpTSsaMDtOuKcJVhTlNnERQD3XDoXfqm21gBCXmkNCMxNk5QM1lyinO+9df/PdJTaxbK71YYcYKJAHZELMa1n1XApi4f2NpA+IYDwdXh5ndzxSErNFYBExI= 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 1725719645210216.2109872483095; Sat, 7 Sep 2024 07:34:05 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 2E3E81997; Sat, 7 Sep 2024 10:34:04 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id B45AA18AD; Sat, 7 Sep 2024 10:32:37 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 7420D18EB; Sat, 7 Sep 2024 10:32:33 -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 8788418CE for ; Sat, 7 Sep 2024 10:32:14 -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 1smwRV-001ZxE-2A; Sat, 07 Sep 2024 16:32:08 +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=Tiy/DjybGHEExl8hEF92TCUW7uHl4HTVzaCuustxDds=; b=WoJ0Vd4FTXAF Qf0oeeNHisdrHnHKOWCX3jnc+UTa88Tj1MEjklccmDbNNyg2L/wJxWpWd67jvTo522fnBGSF57J17 BZ+juaCyZPqJNkXHsUNfb2yfeSxSdqHNW0lPuSXG3z6epd9F7Slg09BajoA8HgeBLOMjIaRVmIANy M8dmYi1T/Tnzvg+hC+wIddrLjMZqTOfz/eGAFAlv3sooNTAEfQP2lHd0XowFjKmt5WZUkN1W9hMEh BdLHbg2nErVFIHaY8b1aL0dzyCvB6iTPyG0GBZ0N+siL9aXeSO2mgIT15MScit3NeOJdw67HGW6Xd kVh8H3JPAYgmK3L1Wlo2vQ==; To: devel@lists.libvirt.org Subject: [PATCH v2 09/13] qemu: factor out qemuDomainPrepareStorageSource() Date: Sat, 7 Sep 2024 17:15:33 +0300 Message-ID: <20240907143006.50677-19-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: BQQGO75LFMJDTANUYD26VBONGGOUB73B X-Message-ID-Hash: BQQGO75LFMJDTANUYD26VBONGGOUB73B 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: 1725719647205116600 Content-Type: text/plain; charset="utf-8" This refactoring will simplify next changes. Signed-off-by: Nikolai Barybin Reviewed-by: Peter Krempa --- src/qemu/qemu_domain.c | 40 +++++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ed305d9427..86362393e2 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -7974,6 +7974,32 @@ qemuDomainPrepareStorageSourceConfig(virStorageSourc= e *src, } =20 =20 +static int +qemuDomainPrepareStorageSource(virStorageSource *src, + virDomainObj *vm, + virDomainDiskDef *disk, + virQEMUDriverConfig *cfg) +{ + qemuDomainObjPrivate *priv =3D vm->privateData; + + /* convert detected ISO format to 'raw' as qemu would not understand i= t */ + if (src->format =3D=3D VIR_STORAGE_FILE_ISO) + src->format =3D VIR_STORAGE_FILE_RAW; + + if (qemuDomainValidateStorageSource(src, priv->qemuCaps) < 0) + return -1; + + qemuDomainPrepareStorageSourceConfig(src, cfg); + qemuDomainPrepareDiskSourceData(disk, src); + + if (!qemuDiskBusIsSD(disk->bus) && + qemuDomainPrepareStorageSourceBlockdev(disk, src, priv, cfg) < 0) + return -1; + + return 0; +} + + /** * qemuDomainDetermineDiskChain: * @driver: qemu driver object @@ -7994,7 +8020,6 @@ qemuDomainDetermineDiskChain(virQEMUDriver *driver, g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); virStorageSource *src; /* iterator for the backing chain declared in X= ML */ virStorageSource *n; /* iterator for the backing chain detected from d= isk */ - qemuDomainObjPrivate *priv =3D vm->privateData; uid_t uid; gid_t gid; =20 @@ -8078,18 +8103,7 @@ qemuDomainDetermineDiskChain(virQEMUDriver *driver, return -1; =20 for (n =3D src->backingStore; virStorageSourceIsBacking(n); n =3D n->b= ackingStore) { - /* convert detected ISO format to 'raw' as qemu would not understa= nd it */ - if (n->format =3D=3D VIR_STORAGE_FILE_ISO) - n->format =3D VIR_STORAGE_FILE_RAW; - - if (qemuDomainValidateStorageSource(n, priv->qemuCaps) < 0) - return -1; - - qemuDomainPrepareStorageSourceConfig(n, cfg); - qemuDomainPrepareDiskSourceData(disk, n); - - if (!qemuDiskBusIsSD(disk->bus) && - qemuDomainPrepareStorageSourceBlockdev(disk, n, priv, cfg) < 0) + if (qemuDomainPrepareStorageSource(n, vm, disk, cfg) < 0) return -1; } =20 --=20 2.43.5