From nobody Sun Feb 8 18:43:48 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=1637839091; cv=none; d=zohomail.com; s=zohoarc; b=F6HUoOU6Zx1HTdyeoU61RNX9Ie7f75sFWwnpVrOLFfdJ0r0oF647i3++RR91jFPt62NotXJLnHtrxwXL+xqaIkSiaPPMDlun0+Kmvj7j3LqrcY5LntGoaMJtb/W85YKcRRm2KZP1CRR+NBCiA6OY7Sg38Y9vXxADvIrcI75SooA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1637839091; 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=AkfLOVxC8BGFVigJvip91Ac2KBwlL0rm5cxAtKxZmXA=; b=h5kBgD89GKmWRsSkL7TlK7Wf91dPHTIHEPSqRfDpwxh+DSmEgeJd73vc7Rmu6JDDFgof4lZ9PXHxGuMLyW8MXte143C5oJJI9WFxL2XXDm6IdJLmzCIAAK7nrZWeOENPbNeg8WkdIyuU1s1dSxolxT2+wz/EEdRClNn/8B+q5LA= 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 1637839091048449.7059134709119; Thu, 25 Nov 2021 03:18:11 -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-451-tfMPBC0LMHughIq5Y5dh_A-1; Thu, 25 Nov 2021 06:16:32 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 57309801B00; Thu, 25 Nov 2021 11:16:27 +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 DCD8176613; Thu, 25 Nov 2021 11:16:26 +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 41D891809C89; Thu, 25 Nov 2021 11:16:24 +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 1APBGNAF022795 for ; Thu, 25 Nov 2021 06:16:23 -0500 Received: by smtp.corp.redhat.com (Postfix) id 605261000051; Thu, 25 Nov 2021 11:16:23 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.97]) by smtp.corp.redhat.com (Postfix) with ESMTP id D22D11002390 for ; Thu, 25 Nov 2021 11:16:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637839090; 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=AkfLOVxC8BGFVigJvip91Ac2KBwlL0rm5cxAtKxZmXA=; b=ciiqSlJ+u9UT9tSbQjmGFda1cWpSxDYO7gBVJMbV7pyVcWp41XBu7sqXTQnkzB7AaXWgjP 4T6q1dUPanAzT4+VwTdi47veG4aCBn9Oo3hmYkF1SLaIAnfQh1DH+1gAjJsj1RJ3uhcSJr 9tStM80NLKqP677W8h1DSLdDJ/88qqo= X-MC-Unique: tfMPBC0LMHughIq5Y5dh_A-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 01/11] qemu_snapshot: create: move XML parsing to separate function Date: Thu, 25 Nov 2021 12:16:07 +0100 Message-Id: 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.16 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: 1637839092070100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- src/qemu/qemu_snapshot.c | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 661aeeb8aa..6ba3215ee3 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -1531,6 +1531,30 @@ qemuSnapshotCreateActiveExternal(virQEMUDriver *driv= er, } =20 =20 +static virDomainSnapshotDef* +qemuSnapshotCreateXMLParse(virDomainObj *vm, + virQEMUDriver *driver, + const char *xmlDesc, + unsigned int flags) +{ + qemuDomainObjPrivate *priv =3D vm->privateData; + unsigned int parse_flags =3D VIR_DOMAIN_SNAPSHOT_PARSE_DISKS; + + if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE) + parse_flags |=3D VIR_DOMAIN_SNAPSHOT_PARSE_REDEFINE; + + if ((flags & VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY) || + !virDomainObjIsActive(vm)) + parse_flags |=3D VIR_DOMAIN_SNAPSHOT_PARSE_OFFLINE; + + if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_VALIDATE) + parse_flags |=3D VIR_DOMAIN_SNAPSHOT_PARSE_VALIDATE; + + return virDomainSnapshotDefParseString(xmlDesc, driver->xmlopt, + priv->qemuCaps, NULL, parse_fla= gs); +} + + virDomainSnapshotPtr qemuSnapshotCreateXML(virDomainPtr domain, virDomainObj *vm, @@ -1544,7 +1568,6 @@ qemuSnapshotCreateXML(virDomainPtr domain, virDomainMomentObj *current =3D NULL; bool update_current =3D true; bool redefine =3D flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE; - unsigned int parse_flags =3D VIR_DOMAIN_SNAPSHOT_PARSE_DISKS; int align_location =3D VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL; bool align_match =3D true; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); @@ -1573,8 +1596,6 @@ qemuSnapshotCreateXML(virDomainPtr domain, if ((redefine && !(flags & VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT)) || (flags & VIR_DOMAIN_SNAPSHOT_CREATE_NO_METADATA)) update_current =3D false; - if (redefine) - parse_flags |=3D VIR_DOMAIN_SNAPSHOT_PARSE_REDEFINE; =20 if (qemuDomainSupportsCheckpointsBlockjobs(vm) < 0) return NULL; @@ -1584,15 +1605,8 @@ qemuSnapshotCreateXML(virDomainPtr domain, _("cannot halt after transient domain snapshot")); return NULL; } - if ((flags & VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY) || - !virDomainObjIsActive(vm)) - parse_flags |=3D VIR_DOMAIN_SNAPSHOT_PARSE_OFFLINE; =20 - if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_VALIDATE) - parse_flags |=3D VIR_DOMAIN_SNAPSHOT_PARSE_VALIDATE; - - if (!(def =3D virDomainSnapshotDefParseString(xmlDesc, driver->xmlopt, - priv->qemuCaps, NULL, pars= e_flags))) + if (!(def =3D qemuSnapshotCreateXMLParse(vm, driver, xmlDesc, flags))) return NULL; =20 /* reject snapshot names containing slashes or starting with dot as --=20 2.31.1