From nobody Mon Feb 9 03:48:12 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 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=1600933101; cv=none; d=zohomail.com; s=zohoarc; b=YlRmYyCFYWDaMQwJIR3wY8fA0cry7go55kVBIWhRzfAh06FaI3qI9ArOQJ22xV5RoaBcWZV7RALzUuNkm0Be5eFnTb9QgvJAQAcV7iRpnB+TsoIUZz9P3dTkpUuWwNqWulZakv4v9K11x/DzeQtM0+7xeGXkel+aL/gOodDwNEc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600933101; 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; bh=bC/frR7TjnsZTXIC0kIIA5qbW3twww5HP3Ykk4eFuE4=; b=e/YQ+LEeW4VZeCwfO79028tEkfteBiQgKgFLgCjAlBIqFYz1WQCpNKgn3OOzmw9oDRi4YP4UDMlE2ZAtiZoPdvhFsJItb37V+EsMm+KGW8rG+ZAxKVUzTae2Aux0hYNO9mOqM9mUhn/+j3GPfmPLRVfV4XW7qGYRwYvSGGDF+Mk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 160093310152259.41071044089426; Thu, 24 Sep 2020 00:38:21 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-396-bC5qPPVDMY2y7Pg20Trnxw-1; Thu, 24 Sep 2020 03:38:18 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0730164144; Thu, 24 Sep 2020 07:38:13 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EB44E5DA81; Thu, 24 Sep 2020 07:38:11 +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 AF3788C7A0; Thu, 24 Sep 2020 07:38:11 +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 08O7bxfK009129 for ; Thu, 24 Sep 2020 03:37:59 -0400 Received: by smtp.corp.redhat.com (Postfix) id 67F077366A; Thu, 24 Sep 2020 07:37:59 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id BE72C73668 for ; Thu, 24 Sep 2020 07:37:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600933100; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=bC/frR7TjnsZTXIC0kIIA5qbW3twww5HP3Ykk4eFuE4=; b=DaVNr/FWPv571BEssXsnYdCocKidUKyQuxgujdU+drCNohTzoAlRlzBUQHSHVqB1fl5Cw5 zXztxws4rEv0SW4YDWBGzLhm0z8j9QYItbiUmqyjEysEWaxIY+RbXgsIg9dYlLUUSRBcG/ lnTlnB+q1q0O+KZVIyZiaKzQ2pToVWo= X-MC-Unique: bC5qPPVDMY2y7Pg20Trnxw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 3/6] qemuSnapshotDiskPrepare/Cleanup: simplify passing of 'driver' and 'blockdev' Date: Thu, 24 Sep 2020 09:37:48 +0200 Message-Id: <054f715e195474837d3c8655ece8d6e552a8f58f.1600932998.git.pkrempa@redhat.com> 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 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Both can be fetched from 'vm'. Signed-off-by: Peter Krempa --- src/qemu/qemu_snapshot.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index d6e0a75996..6fdc187d83 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -792,10 +792,11 @@ typedef qemuSnapshotDiskData *qemuSnapshotDiskDataPtr; static void qemuSnapshotDiskCleanup(qemuSnapshotDiskDataPtr data, size_t ndata, - virQEMUDriverPtr driver, virDomainObjPtr vm, qemuDomainAsyncJob asyncJob) { + qemuDomainObjPrivatePtr priv =3D vm->privateData; + virQEMUDriverPtr driver =3D priv->driver; virErrorPtr orig_err; size_t i; @@ -931,18 +932,19 @@ qemuSnapshotDiskPrepareOneBlockdev(virQEMUDriverPtr d= river, static int -qemuSnapshotDiskPrepareOne(virQEMUDriverPtr driver, - virDomainObjPtr vm, +qemuSnapshotDiskPrepareOne(virDomainObjPtr vm, virQEMUDriverConfigPtr cfg, virDomainDiskDefPtr disk, virDomainSnapshotDiskDefPtr snapdisk, qemuSnapshotDiskDataPtr dd, virHashTablePtr blockNamedNodeData, bool reuse, - bool blockdev, qemuDomainAsyncJob asyncJob, virJSONValuePtr actions) { + qemuDomainObjPrivatePtr priv =3D vm->privateData; + virQEMUDriverPtr driver =3D priv->driver; + bool blockdev =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV); virDomainDiskDefPtr persistdisk; bool supportsCreate; bool updateRelativeBacking =3D false; @@ -1045,12 +1047,10 @@ qemuSnapshotDiskPrepareOne(virQEMUDriverPtr driver, * that are selected for the snapshot. */ static int -qemuSnapshotDiskPrepare(virQEMUDriverPtr driver, - virDomainObjPtr vm, +qemuSnapshotDiskPrepare(virDomainObjPtr vm, virDomainMomentObjPtr snap, virQEMUDriverConfigPtr cfg, bool reuse, - bool blockdev, virHashTablePtr blockNamedNodeData, qemuDomainAsyncJob asyncJob, qemuSnapshotDiskDataPtr *rdata, @@ -1070,11 +1070,11 @@ qemuSnapshotDiskPrepare(virQEMUDriverPtr driver, if (snapdef->disks[i].snapshot =3D=3D VIR_DOMAIN_SNAPSHOT_LOCATION= _NONE) continue; - if (qemuSnapshotDiskPrepareOne(driver, vm, cfg, vm->def->disks[i], + if (qemuSnapshotDiskPrepareOne(vm, cfg, vm->def->disks[i], snapdef->disks + i, data + ndata++, blockNamedNodeData, - reuse, blockdev, + reuse, asyncJob, actions) < 0) goto cleanup; @@ -1085,7 +1085,7 @@ qemuSnapshotDiskPrepare(virQEMUDriverPtr driver, ret =3D 0; cleanup: - qemuSnapshotDiskCleanup(data, ndata, driver, vm, asyncJob); + qemuSnapshotDiskCleanup(data, ndata, vm, asyncJob); return ret; } @@ -1166,7 +1166,6 @@ qemuSnapshotCreateActiveExternalDisks(virQEMUDriverPt= r driver, bool reuse =3D (flags & VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT) !=3D 0; qemuSnapshotDiskDataPtr diskdata =3D NULL; size_t ndiskdata =3D 0; - bool blockdev =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV); if (virDomainObjCheckActive(vm) < 0) return -1; @@ -1175,7 +1174,7 @@ qemuSnapshotCreateActiveExternalDisks(virQEMUDriverPt= r driver, /* prepare a list of objects to use in the vm definition so that we do= n't * have to roll back later */ - if (qemuSnapshotDiskPrepare(driver, vm, snap, cfg, reuse, blockdev, + if (qemuSnapshotDiskPrepare(vm, snap, cfg, reuse, blockNamedNodeData, asyncJob, &diskdata, &ndiskdata, actions) < 0) goto cleanup; @@ -1214,7 +1213,7 @@ qemuSnapshotCreateActiveExternalDisks(virQEMUDriverPt= r driver, ret =3D 0; cleanup: - qemuSnapshotDiskCleanup(diskdata, ndiskdata, driver, vm, asyncJob); + qemuSnapshotDiskCleanup(diskdata, ndiskdata, vm, asyncJob); return ret; } --=20 2.26.2