From nobody Mon Feb 9 07:26:01 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1600933098; cv=none; d=zohomail.com; s=zohoarc; b=Aofd4fsS6PUszl19iE8A/pD2b1D1JP9sK0pide0Isml7m+dUph7l2zL429PzD97B8nTyd+l6wps0YuxUBZ52k2RRx6YwVLfP2EUuQ3ANCBiLSXW1z7eXXQ9S/0nEaNtWM+PwwbvRm2KzwnWe+X/Azd5EmJOE9bUJMlbQo0/HmZM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600933098; 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=M4g0rqY+3eFHAVCGsw3059ws38dzdWEvo0KRguOGJDs=; b=hkrUF24X8sN9+R4ac8vvMFpknXxVBXdyO6B+7Zjg1cj4ahCGUvZvzd37/rCf7gGjYI+Yunzg+NYUKvE8rUwI4nnE3ySYo71lTMC1p+scJ8kGlt7ynFxJHFusyuJqTAN2ZLcGSUei8BJuPhuNmBxTymRD8rwgP7lFCs/rBCCru1o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1600933098120662.1341743157806; Thu, 24 Sep 2020 00:38:18 -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-569-W08J_gCaOXubdSl32mDs7w-1; Thu, 24 Sep 2020 03:38:14 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4A93B64143; Thu, 24 Sep 2020 07:38:03 +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 203FD19930; Thu, 24 Sep 2020 07:38:03 +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 DBFDD181A07B; Thu, 24 Sep 2020 07:38:02 +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 08O7c1Ec009148 for ; Thu, 24 Sep 2020 03:38:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8082973684; Thu, 24 Sep 2020 07:38:01 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id D099373668 for ; Thu, 24 Sep 2020 07:38:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600933096; 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=M4g0rqY+3eFHAVCGsw3059ws38dzdWEvo0KRguOGJDs=; b=Sl9tjYvXU5sDfd/Gc+72+eZFcVunu2NtWV1ANaQZHgJIvFqguFG9Z5kCvcjZySDtjVcNpr bDv6Pms1a1Su1OlMc70O+ps7k1KV3HyunctjyQKUkRuMaOXPf99qNwX1BYqZpV+TKEBzTX wiwI/nm4ZHYHtTzxb7fLeVzDlE+ixlc= X-MC-Unique: W08J_gCaOXubdSl32mDs7w-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 5/6] qemuSnapshotCreateActiveExternalDisks: Extract actual snapshot creation to 'qemuSnapshotDiskCreate' Date: Thu, 24 Sep 2020 09:37:50 +0200 Message-Id: <6ab465ed1b810ef1251c23de0de74d6cae0b058c.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.84 on 10.5.11.23 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" Extract the code which invokes the monitor and finalizes the snapshot into a separate function for easier reuse. Signed-off-by: Peter Krempa --- src/qemu/qemu_snapshot.c | 67 ++++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 27 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index b9b640058c..6fe925763e 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -1182,57 +1182,42 @@ qemuSnapshotDiskUpdateSource(virDomainObjPtr vm, } -/* The domain is expected to be locked and active. */ static int -qemuSnapshotCreateActiveExternalDisks(virQEMUDriverPtr driver, - virDomainObjPtr vm, - virDomainMomentObjPtr snap, - virHashTablePtr blockNamedNodeData, - unsigned int flags, - virQEMUDriverConfigPtr cfg, - qemuDomainAsyncJob asyncJob) +qemuSnapshotDiskCreate(qemuSnapshotDiskContextPtr snapctxt, + virQEMUDriverConfigPtr cfg) { - qemuDomainObjPrivatePtr priv =3D vm->privateData; - int rc; + qemuDomainObjPrivatePtr priv =3D snapctxt->vm->privateData; + virQEMUDriverPtr driver =3D priv->driver; size_t i; - bool reuse =3D (flags & VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT) !=3D 0; - g_autoptr(qemuSnapshotDiskContext) snapctxt =3D NULL; - - if (virDomainObjCheckActive(vm) < 0) - return -1; + int rc; - /* prepare a list of objects to use in the vm definition so that we do= n't - * have to roll back later */ - if (!(snapctxt =3D qemuSnapshotDiskPrepare(vm, snap, cfg, reuse, - blockNamedNodeData, asyncJob)= )) - return -1; /* check whether there's anything to do */ if (snapctxt->ndd =3D=3D 0) return 0; - if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) + if (qemuDomainObjEnterMonitorAsync(driver, snapctxt->vm, snapctxt->asy= ncJob) < 0) return -1; rc =3D qemuMonitorTransaction(priv->mon, &snapctxt->actions); - if (qemuDomainObjExitMonitor(driver, vm) < 0) + if (qemuDomainObjExitMonitor(driver, snapctxt->vm) < 0) rc =3D -1; for (i =3D 0; i < snapctxt->ndd; i++) { qemuSnapshotDiskDataPtr dd =3D snapctxt->dd + i; - virDomainAuditDisk(vm, dd->disk->src, dd->src, "snapshot", rc >=3D= 0); + virDomainAuditDisk(snapctxt->vm, dd->disk->src, dd->src, "snapshot= ", rc >=3D 0); if (rc =3D=3D 0) - qemuSnapshotDiskUpdateSource(vm, dd); + qemuSnapshotDiskUpdateSource(snapctxt->vm, dd); } if (rc < 0) return -1; - if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0 || - (vm->newDef && virDomainDefSave(vm->newDef, driver->xmlopt, + if (virDomainObjSave(snapctxt->vm, driver->xmlopt, cfg->stateDir) < 0 = || + (snapctxt->vm->newDef && virDomainDefSave(snapctxt->vm->newDef, dr= iver->xmlopt, cfg->configDir) < 0)) return -1; @@ -1240,6 +1225,34 @@ qemuSnapshotCreateActiveExternalDisks(virQEMUDriverP= tr driver, } +/* The domain is expected to be locked and active. */ +static int +qemuSnapshotCreateActiveExternalDisks(virDomainObjPtr vm, + virDomainMomentObjPtr snap, + virHashTablePtr blockNamedNodeData, + unsigned int flags, + virQEMUDriverConfigPtr cfg, + qemuDomainAsyncJob asyncJob) +{ + bool reuse =3D (flags & VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT) !=3D 0; + g_autoptr(qemuSnapshotDiskContext) snapctxt =3D NULL; + + if (virDomainObjCheckActive(vm) < 0) + return -1; + + /* prepare a list of objects to use in the vm definition so that we do= n't + * have to roll back later */ + if (!(snapctxt =3D qemuSnapshotDiskPrepare(vm, snap, cfg, reuse, + blockNamedNodeData, asyncJob)= )) + return -1; + + if (qemuSnapshotDiskCreate(snapctxt, cfg) < 0) + return -1; + + return 0; +} + + static int qemuSnapshotCreateActiveExternal(virQEMUDriverPtr driver, virDomainObjPtr vm, @@ -1366,7 +1379,7 @@ qemuSnapshotCreateActiveExternal(virQEMUDriverPtr dri= ver, /* the domain is now paused if a memory snapshot was requested */ - if ((ret =3D qemuSnapshotCreateActiveExternalDisks(driver, vm, snap, + if ((ret =3D qemuSnapshotCreateActiveExternalDisks(vm, snap, blockNamedNodeData, f= lags, cfg, QEMU_ASYNC_JOB_SNAPSH= OT)) < 0) goto cleanup; --=20 2.26.2