From nobody Sun Feb 8 09:37:44 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1637839006; cv=none; d=zohomail.com; s=zohoarc; b=FN2h5KC8CXeGNbdXAiuy/swQePfKooVOEHPP6ZF7p7d1Nkm8+p5m927x5Wij7yFECH081PoB9hqXMs0v94n+QvwRUIybRxM4+ru8iMUGWwZjwQLsLy9s05+IqX0XgRxKB5FxJ6CKDRq/R6R9qjFB38p+obIKDWH6b36SOCozf2g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1637839006; 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=FHu7eou+jypXOmhslTN0jxUHc3FqT3zWg3O3w/5NTbA=; b=GvDj5gLZvdRh5ax9xSs4ekDV/thsKdCBbV/Xs4m94gVMmdqc+PKDbEOR8qCfBpvnfiPoRWvwq/YkifyQ/dRhA7ni/DolcSnRPnjo7RBdrDLxnQQI0miNy6CGrX5LTJ0AQVMfva6rzp0/3UrpwQ6SHvGpLaOJCkJm1uFabITKrj0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1637839006362402.0585730911746; Thu, 25 Nov 2021 03:16:46 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-374-iJUD_GNrPWGEjfDCW9vieg-1; Thu, 25 Nov 2021 06:16:41 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id C87E681C9BE; Thu, 25 Nov 2021 11:16:36 +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 AC7DF60C7F; Thu, 25 Nov 2021 11:16:36 +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 75EDE4A7C8; Thu, 25 Nov 2021 11:16:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1APBGPPT022808 for ; Thu, 25 Nov 2021 06:16:25 -0500 Received: by smtp.corp.redhat.com (Postfix) id 29A791000051; Thu, 25 Nov 2021 11:16:25 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.97]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9AF5C1002390 for ; Thu, 25 Nov 2021 11:16:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637839005; 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=FHu7eou+jypXOmhslTN0jxUHc3FqT3zWg3O3w/5NTbA=; b=beDRpBNiXLkYRo8DaolPUw+yIo6tJ40rbZMpdzery8H/3n7i5rfJU51y1fV3q71+TTcavG nrNdy4aXpeLe95vT3uINmdHhixGcY15sr6iuk3Dz/Y3A5ySmi/b41r/7rPzzk4qiyMB7Ei Y4luUF9WJ9MvQoMyVHzUM6n3KQfRzGI= X-MC-Unique: iJUD_GNrPWGEjfDCW9vieg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 03/11] qemu_snapshot: create: move disk align to separate function Date: Thu, 25 Nov 2021 12:16:09 +0100 Message-Id: <5ccb4a4945fb7bc196badbb9be9b2ffeb1b4410f.1637838934.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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.12 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) X-ZM-MESSAGEID: 1637839006830100004 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- src/qemu/qemu_snapshot.c | 115 ++++++++++++++++++++++----------------- 1 file changed, 65 insertions(+), 50 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 5ebe959151..7198a2aad3 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -1631,6 +1631,69 @@ qemuSnapshotCreateXMLValidateDef(virDomainObj *vm, } =20 =20 +static int +qemuSnapshotAlignDisks(virDomainObj *vm, + virDomainSnapshotDef *def, + virQEMUDriver *driver, + unsigned int flags) +{ + g_autofree char *xml =3D NULL; + qemuDomainObjPrivate *priv =3D vm->privateData; + int align_location =3D VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL; + bool align_match =3D true; + + /* Easiest way to clone inactive portion of vm->def is via + * conversion in and back out of xml. */ + if (!(xml =3D qemuDomainDefFormatLive(driver, priv->qemuCaps, + vm->def, priv->origCPU, + true, true)) || + !(def->parent.dom =3D virDomainDefParseString(xml, driver->xmlopt, + priv->qemuCaps, + VIR_DOMAIN_DEF_PARSE_I= NACTIVE | + VIR_DOMAIN_DEF_PARSE_S= KIP_VALIDATE))) + return -1; + + if (vm->newDef) { + def->parent.inactiveDom =3D virDomainDefCopy(vm->newDef, + driver->xmlopt, priv->q= emuCaps, true); + if (!def->parent.inactiveDom) + return -1; + } + + if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY) { + align_location =3D VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL; + align_match =3D false; + if (virDomainObjIsActive(vm)) + def->state =3D VIR_DOMAIN_SNAPSHOT_DISK_SNAPSHOT; + else + def->state =3D VIR_DOMAIN_SNAPSHOT_SHUTOFF; + def->memory =3D VIR_DOMAIN_SNAPSHOT_LOCATION_NONE; + } else if (def->memory =3D=3D VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL) { + def->state =3D virDomainObjGetState(vm, NULL); + align_location =3D VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL; + align_match =3D false; + } else { + def->state =3D virDomainObjGetState(vm, NULL); + + if (virDomainObjIsActive(vm) && + def->memory =3D=3D VIR_DOMAIN_SNAPSHOT_LOCATION_NONE) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("internal snapshot of a running VM " + "must include the memory state")); + return -1; + } + + def->memory =3D (def->state =3D=3D VIR_DOMAIN_SNAPSHOT_SHUTOFF ? + VIR_DOMAIN_SNAPSHOT_LOCATION_NONE : + VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL); + } + if (virDomainSnapshotAlignDisks(def, align_location, align_match) < 0) + return -1; + + return 0; +} + + virDomainSnapshotPtr qemuSnapshotCreateXML(virDomainPtr domain, virDomainObj *vm, @@ -1638,16 +1701,12 @@ qemuSnapshotCreateXML(virDomainPtr domain, unsigned int flags) { virQEMUDriver *driver =3D domain->conn->privateData; - g_autofree char *xml =3D NULL; virDomainMomentObj *snap =3D NULL; virDomainSnapshotPtr snapshot =3D NULL; virDomainMomentObj *current =3D NULL; bool update_current =3D true; bool redefine =3D flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE; - int align_location =3D VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL; - bool align_match =3D true; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); - qemuDomainObjPrivate *priv =3D vm->privateData; g_autoptr(virDomainSnapshotDef) def =3D NULL; =20 virCheckFlags(VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE | @@ -1703,54 +1762,10 @@ qemuSnapshotCreateXML(virDomainPtr domain, flags) < 0) goto endjob; } else { - /* Easiest way to clone inactive portion of vm->def is via - * conversion in and back out of xml. */ - if (!(xml =3D qemuDomainDefFormatLive(driver, priv->qemuCaps, - vm->def, priv->origCPU, - true, true)) || - !(def->parent.dom =3D virDomainDefParseString(xml, driver->xml= opt, - priv->qemuCaps, - VIR_DOMAIN_DEF_PAR= SE_INACTIVE | - VIR_DOMAIN_DEF_PAR= SE_SKIP_VALIDATE))) + if (qemuSnapshotAlignDisks(vm, def, driver, flags) < 0) goto endjob; =20 - if (vm->newDef) { - def->parent.inactiveDom =3D virDomainDefCopy(vm->newDef, - driver->xmlopt, pri= v->qemuCaps, true); - if (!def->parent.inactiveDom) - goto endjob; - } - - if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY) { - align_location =3D VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL; - align_match =3D false; - if (virDomainObjIsActive(vm)) - def->state =3D VIR_DOMAIN_SNAPSHOT_DISK_SNAPSHOT; - else - def->state =3D VIR_DOMAIN_SNAPSHOT_SHUTOFF; - def->memory =3D VIR_DOMAIN_SNAPSHOT_LOCATION_NONE; - } else if (def->memory =3D=3D VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNA= L) { - def->state =3D virDomainObjGetState(vm, NULL); - align_location =3D VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL; - align_match =3D false; - } else { - def->state =3D virDomainObjGetState(vm, NULL); - - if (virDomainObjIsActive(vm) && - def->memory =3D=3D VIR_DOMAIN_SNAPSHOT_LOCATION_NONE) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("internal snapshot of a running VM " - "must include the memory state")); - goto endjob; - } - - def->memory =3D (def->state =3D=3D VIR_DOMAIN_SNAPSHOT_SHUTOFF= ? - VIR_DOMAIN_SNAPSHOT_LOCATION_NONE : - VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL); - } - if (virDomainSnapshotAlignDisks(def, align_location, - align_match) < 0 || - qemuSnapshotPrepare(vm, def, &flags) < 0) + if (qemuSnapshotPrepare(vm, def, &flags) < 0) goto endjob; } =20 --=20 2.31.1