From nobody Mon Feb 9 12:29:08 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1559748579; cv=none; d=zoho.com; s=zohoarc; b=ChXgNAEuZKr0SgcPzFs5qpkeiUqWaYxUybtf+cFj+x2l5KusjsCHjilmFRLezwumZcJ8AS8Fawgr0BG7O7j2CoHx5KMbgTRB2qQq9kQUkVbdtiZLpYBV6HxfV6aJaPOGCklILsS4tvKhEfjCf3BNtMUVKsG5MNWjQRqzr5Q36a8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559748579; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=usYjLCpD22PvZMlclwHLoR/8Z4o7WsEnCTMDFZ4J9MM=; b=jzl9kkBQ6AV5wKYvQKI4xlVTtKX92aIwswFNWmIw6r7l9gyfJLlFWiK4T765DEdWphv2stbIVoVQXbwmvJpJeblb70Fjzq3CRp6yjTJMW9kLEzGReO2r/sKw5OpGkqjNtsfixLCPK7ktwPpKD2RVReLguAEqFXCkbAcmgvS2tFU= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1559748579338376.16173657908087; Wed, 5 Jun 2019 08:29:39 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 45DD722388D; Wed, 5 Jun 2019 15:29:12 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 04CCE84EF; Wed, 5 Jun 2019 15:29:04 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id A52F81806B0F; Wed, 5 Jun 2019 15:28:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x55FSk5e012936 for ; Wed, 5 Jun 2019 11:28:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5A0AC17F22; Wed, 5 Jun 2019 15:28:46 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id D77B35F7C0 for ; Wed, 5 Jun 2019 15:28:45 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Wed, 5 Jun 2019 17:28:30 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 08/13] qemu: snapshot: Densely pack data in qemuDomainSnapshotDiskDataCollect X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 05 Jun 2019 15:29:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" The function skips disks which are not selected for snapshot. Rather than creating a sparse array and check whether the given field is filled compress the entries. Note that this does not allocate a smaller array, but the memory allocation is short-lived. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_driver.c | 69 +++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 38 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 40182c84e5..9736933143 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15071,37 +15071,42 @@ qemuDomainSnapshotDiskDataFree(qemuDomainSnapshot= DiskDataPtr data, * Collects and prepares a list of structures that hold information about = disks * that are selected for the snapshot. */ -static qemuDomainSnapshotDiskDataPtr +static int qemuDomainSnapshotDiskDataCollect(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainMomentObjPtr snap, - bool reuse) + bool reuse, + qemuDomainSnapshotDiskDataPtr *rdata, + size_t *rndata) { size_t i; - qemuDomainSnapshotDiskDataPtr ret; + qemuDomainSnapshotDiskDataPtr data; + size_t ndata =3D 0; qemuDomainSnapshotDiskDataPtr dd; char *backingStoreStr; virDomainSnapshotDefPtr snapdef =3D virDomainSnapshotObjGetDef(snap); + int ret =3D -1; - if (VIR_ALLOC_N(ret, snapdef->ndisks) < 0) - return NULL; + if (VIR_ALLOC_N(data, snapdef->ndisks) < 0) + return -1; for (i =3D 0; i < snapdef->ndisks; i++) { if (snapdef->disks[i].snapshot =3D=3D VIR_DOMAIN_SNAPSHOT_LOCATION= _NONE) continue; - dd =3D ret + i; + ndata++; + dd =3D data + ndata; dd->disk =3D vm->def->disks[i]; if (!(dd->src =3D virStorageSourceCopy(snapdef->disks[i].src, fals= e))) - goto error; + goto cleanup; if (virStorageSourceInitChainElement(dd->src, dd->disk->src, false= ) < 0) - goto error; + goto cleanup; if (qemuDomainStorageFileInit(driver, vm, dd->src, NULL) < 0) - goto error; + goto cleanup; dd->initialized =3D true; @@ -15109,7 +15114,7 @@ qemuDomainSnapshotDiskDataCollect(virQEMUDriverPtr = driver, * block commit still works */ if (reuse) { if (virStorageFileGetBackingStoreStr(dd->src, &backingStoreStr= ) < 0) - goto error; + goto cleanup; if (backingStoreStr !=3D NULL) { if (virStorageIsRelative(backingStoreStr)) VIR_STEAL_PTR(dd->relPath, backingStoreStr); @@ -15127,19 +15132,21 @@ qemuDomainSnapshotDiskDataCollect(virQEMUDriverPt= r driver, false))) { if (!(dd->persistsrc =3D virStorageSourceCopy(dd->src, false))) - goto error; + goto cleanup; if (virStorageSourceInitChainElement(dd->persistsrc, dd->persistdisk->src, fal= se) < 0) - goto error; + goto cleanup; } } - return ret; + VIR_STEAL_PTR(*rdata, data); + *rndata =3D ndata; + ret =3D 0; - error: - qemuDomainSnapshotDiskDataFree(ret, snapdef->ndisks, driver, vm); - return NULL; + cleanup: + qemuDomainSnapshotDiskDataFree(data, ndata, driver, vm); + return ret; } @@ -15163,9 +15170,6 @@ qemuDomainSnapshotUpdateDiskSourcesRenumber(virStor= ageSourcePtr src) static void qemuDomainSnapshotUpdateDiskSources(qemuDomainSnapshotDiskDataPtr dd) { - if (!dd->src) - return; - /* storage driver access won'd be needed */ if (dd->initialized) virStorageFileDeinit(dd->src); @@ -15233,8 +15237,8 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr= driver, size_t i; bool reuse =3D (flags & VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT) !=3D 0; qemuDomainSnapshotDiskDataPtr diskdata =3D NULL; + size_t ndiskdata =3D 0; virErrorPtr orig_err =3D NULL; - virDomainSnapshotDefPtr snapdef =3D virDomainSnapshotObjGetDef(snap); if (virDomainObjCheckActive(vm) < 0) return -1; @@ -15244,17 +15248,15 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverP= tr driver, /* prepare a list of objects to use in the vm definition so that we do= n't * have to roll back later */ - if (!(diskdata =3D qemuDomainSnapshotDiskDataCollect(driver, vm, snap,= reuse))) + if (qemuDomainSnapshotDiskDataCollect(driver, vm, snap, reuse, + &diskdata, &ndiskdata) < 0) goto cleanup; /* Based on earlier qemuDomainSnapshotPrepare, all disks in this list= are * now either VIR_DOMAIN_SNAPSHOT_LOCATION_NONE, or * VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL with a valid file name and * qcow2 format. */ - for (i =3D 0; i < snapdef->ndisks; i++) { - if (!diskdata[i].src) - continue; - + for (i =3D 0; i < ndiskdata; i++) { ret =3D qemuDomainSnapshotCreateSingleDiskActive(driver, vm, &diskdata[i], actions, reuse); @@ -15274,12 +15276,9 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPt= r driver, if (qemuDomainObjExitMonitor(driver, vm) < 0) ret =3D -1; - for (i =3D 0; i < snapdef->ndisks; i++) { + for (i =3D 0; i < ndiskdata; i++) { qemuDomainSnapshotDiskDataPtr dd =3D &diskdata[i]; - if (!dd->src) - continue; - virDomainAuditDisk(vm, dd->disk->src, dd->src, "snapshot", ret= >=3D 0); if (ret =3D=3D 0) @@ -15293,10 +15292,7 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPt= r driver, error: if (ret < 0) { virErrorPreserveLast(&orig_err); - for (i =3D 0; i < snapdef->ndisks; i++) { - if (!diskdata[i].src) - continue; - + for (i =3D 0; i < ndiskdata; i++) { if (diskdata[i].prepared) qemuDomainStorageSourceAccessRevoke(driver, vm, diskdata[i= ].src); @@ -15310,10 +15306,7 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPt= r driver, * stopped using them*/ bool paused =3D virDomainObjGetState(vm, NULL) !=3D VIR_DOMAIN_RUN= NING; - for (i =3D 0; i < snapdef->ndisks; i++) { - if (!diskdata[i].disk) - continue; - + for (i =3D 0; i < ndiskdata; i++) { if (paused) virDomainLockImageDetach(driver->lockManager, vm, diskdata[i].disk->src); @@ -15329,7 +15322,7 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr= driver, ret =3D -1; cleanup: - qemuDomainSnapshotDiskDataFree(diskdata, snapdef->ndisks, driver, vm); + qemuDomainSnapshotDiskDataFree(diskdata, ndiskdata, driver, vm); virErrorRestore(&orig_err); return ret; --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list