From nobody Mon Feb 9 10:27:53 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=fail(p=none dis=none) header.from=virtuozzo.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1554713039049448.29160164627535; Mon, 8 Apr 2019 01:43:59 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 72335C0624CB; Mon, 8 Apr 2019 08:43:57 +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 4255B5C6B3; Mon, 8 Apr 2019 08:43:57 +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 05ECB4ED96; Mon, 8 Apr 2019 08:43:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x388h2LW009270 for ; Mon, 8 Apr 2019 04:43:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id A8F025DA24; Mon, 8 Apr 2019 08:43:02 +0000 (UTC) Received: from mx1.redhat.com (ext-mx04.extmail.prod.ext.phx2.redhat.com [10.5.110.28]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9E4C15D9C9 for ; Mon, 8 Apr 2019 08:43:02 +0000 (UTC) Received: from relay.sw.ru (relay.sw.ru [185.231.240.75]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AB4BD81113 for ; Mon, 8 Apr 2019 08:43:00 +0000 (UTC) Received: from [10.94.3.220] (helo=dim-vz7.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.91) (envelope-from ) id 1hDPrm-0007TA-5X for libvir-list@redhat.com; Mon, 08 Apr 2019 11:42:58 +0300 From: Nikolay Shirokovskiy To: libvir-list@redhat.com Date: Mon, 8 Apr 2019 11:42:51 +0300 Message-Id: <1554712973-336801-2-git-send-email-nshirokovskiy@virtuozzo.com> In-Reply-To: <1554712973-336801-1-git-send-email-nshirokovskiy@virtuozzo.com> References: <1554712973-336801-1-git-send-email-nshirokovskiy@virtuozzo.com> X-Greylist: Sender passed SPF test, ACL 242 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 08 Apr 2019 08:43:01 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 08 Apr 2019 08:43:01 +0000 (UTC) for IP:'185.231.240.75' DOMAIN:'relay.sw.ru' HELO:'relay.sw.ru' FROM:'nshirokovskiy@virtuozzo.com' RCPT:'' X-RedHat-Spam-Score: -0.001 (SPF_PASS) 185.231.240.75 relay.sw.ru 185.231.240.75 relay.sw.ru X-Scanned-By: MIMEDefang 2.78 on 10.5.110.28 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/3] vz: fix for tracking current snapshot 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: , MIME-Version: 1.0 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 08 Apr 2019 08:43:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" f1056279 removed virDomainSnapshotDef.current and leaved using vm->current_snapshot only. Later 4819f54bd moved current snapshot tracking to virDomainSnapshotObjList. As vz driver never used vm->current_snaphot this patch includes fixes after both commits. Signed-off-by: Nikolay Shirokovskiy --- src/vz/vz_driver.c | 31 ++++--------------------------- src/vz/vz_sdk.c | 14 ++++++-------- 2 files changed, 10 insertions(+), 35 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 40d3a73..f7a44d4 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -2152,29 +2152,6 @@ vzSnapObjFromSnapshot(virDomainSnapshotObjListPtr sn= apshots, } =20 static int -vzCurrentSnapshotIterator(void *payload, - const void *name ATTRIBUTE_UNUSED, - void *data) -{ - virDomainMomentObjPtr snapshot =3D payload; - virDomainMomentObjPtr *current =3D data; - - if (snapshot->def->current) - *current =3D snapshot; - - return 0; -} - -static virDomainMomentObjPtr -vzFindCurrentSnapshot(virDomainSnapshotObjListPtr snapshots) -{ - virDomainMomentObjPtr current =3D NULL; - - virDomainSnapshotForEach(snapshots, vzCurrentSnapshotIterator, ¤= t); - return current; -} - -static int vzDomainSnapshotNum(virDomainPtr domain, unsigned int flags) { virDomainObjPtr dom; @@ -2452,7 +2429,7 @@ vzDomainHasCurrentSnapshot(virDomainPtr domain, unsig= ned int flags) if (!(snapshots =3D prlsdkLoadSnapshots(dom))) goto cleanup; =20 - ret =3D vzFindCurrentSnapshot(snapshots) !=3D NULL; + ret =3D virDomainSnapshotGetCurrent(snapshots) !=3D NULL; =20 cleanup: virDomainSnapshotObjListFree(snapshots); @@ -2518,7 +2495,7 @@ vzDomainSnapshotCurrent(virDomainPtr domain, unsigned= int flags) if (!(snapshots =3D prlsdkLoadSnapshots(dom))) goto cleanup; =20 - if (!(current =3D vzFindCurrentSnapshot(snapshots))) { + if (!(current =3D virDomainSnapshotGetCurrent(snapshots))) { virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, "%s", _("the domain does not have a current snapshot")); goto cleanup; @@ -2552,7 +2529,7 @@ vzDomainSnapshotIsCurrent(virDomainSnapshotPtr snapsh= ot, unsigned int flags) if (!(snapshots =3D prlsdkLoadSnapshots(dom))) goto cleanup; =20 - current =3D vzFindCurrentSnapshot(snapshots); + current =3D virDomainSnapshotGetCurrent(snapshots); ret =3D current && STREQ(snapshot->name, current->def->name); =20 cleanup: @@ -2648,7 +2625,7 @@ vzDomainSnapshotCreateXML(virDomainPtr domain, if (!(snapshots =3D prlsdkLoadSnapshots(dom))) goto cleanup; =20 - if (!(current =3D vzFindCurrentSnapshot(snapshots))) { + if (!(current =3D virDomainSnapshotGetCurrent(snapshots))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("can't find created snapshot")); goto cleanup; diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index f5a5911..92bcb3d 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -4656,7 +4656,6 @@ prlsdkParseSnapshotTree(const char *treexml) xmlNodePtr *nodes =3D NULL; virDomainSnapshotDefPtr def =3D NULL; virDomainMomentObjPtr snapshot; - virDomainMomentObjPtr current =3D NULL; virDomainSnapshotObjListPtr snapshots =3D NULL; char *xmlstr =3D NULL; int n; @@ -4743,22 +4742,21 @@ prlsdkParseSnapshotTree(const char *treexml) } VIR_FREE(xmlstr); =20 - xmlstr =3D virXPathString("string(./@current)", ctxt); - def->current =3D xmlstr && STREQ("yes", xmlstr); - VIR_FREE(xmlstr); - if (!(snapshot =3D virDomainSnapshotAssignDef(snapshots, def))) goto cleanup; def =3D NULL; =20 - if (snapshot->def->current) { - if (current) { + xmlstr =3D virXPathString("string(./@current)", ctxt); + if (xmlstr && STREQ("yes", xmlstr)) { + if (virDomainSnapshotGetCurrent(snapshots)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("too many current snapshots")); + VIR_FREE(xmlstr); goto cleanup; } - current =3D snapshot; + virDomainSnapshotSetCurrent(snapshots, snapshot); } + VIR_FREE(xmlstr); } =20 if (virDomainSnapshotUpdateRelations(snapshots) < 0) { --=20 1.8.3.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list