From nobody Mon Feb 9 04:29:57 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 1554713008710177.93646798926284; Mon, 8 Apr 2019 01:43:28 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 153078AE41; Mon, 8 Apr 2019 08:43:27 +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 E1E8A1A7DB; Mon, 8 Apr 2019 08:43: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 99FD93FB10; Mon, 8 Apr 2019 08:43:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x388h22G009269 for ; Mon, 8 Apr 2019 04:43:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7F9AD5D71B; Mon, 8 Apr 2019 08:43:02 +0000 (UTC) Received: from mx1.redhat.com (ext-mx14.extmail.prod.ext.phx2.redhat.com [10.5.110.43]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 79FA15D719 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 B3487308FBA0 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-EM 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:53 +0300 Message-Id: <1554712973-336801-4-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.43]); Mon, 08 Apr 2019 08:43:01 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); 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.84 on 10.5.110.43 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/3] vz: fixes: snapshot: Factor out virDomainMomentDef class 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.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 08 Apr 2019 08:43:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Fix for commit ffc0fbebe refactoring snapshot code. Signed-off-by: Nikolay Shirokovskiy --- src/vz/vz_driver.c | 2 +- src/vz/vz_sdk.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 20cc79b..d327cac 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -2620,7 +2620,7 @@ vzDomainSnapshotCreateXML(virDomainPtr domain, goto cleanup; =20 /* snaphot name is ignored, it will be set to auto generated by sdk uu= id */ - if (prlsdkCreateSnapshot(dom, def->description) < 0) + if (prlsdkCreateSnapshot(dom, def->common.description) < 0) goto cleanup; =20 if (!(snapshots =3D prlsdkLoadSnapshots(dom))) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 92bcb3d..3d89435 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -4699,14 +4699,14 @@ prlsdkParseSnapshotTree(const char *treexml) =20 ctxt->node =3D nodes[i]; =20 - def->name =3D virXPathString("string(./@guid)", ctxt); - if (!def->name) { + def->common.name =3D virXPathString("string(./@guid)", ctxt); + if (!def->common.name) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("missing 'guid' attribute")); goto cleanup; } =20 - def->parent =3D virXPathString("string(../@guid)", ctxt); + def->common.parent =3D virXPathString("string(../@guid)", ctxt); =20 xmlstr =3D virXPathString("string(./DateTime)", ctxt); if (!xmlstr) { @@ -4714,11 +4714,11 @@ prlsdkParseSnapshotTree(const char *treexml) _("missing 'DateTime' element")); goto cleanup; } - if ((def->creationTime =3D prlsdkParseDateTime(xmlstr)) < 0) + if ((def->common.creationTime =3D prlsdkParseDateTime(xmlstr)) < 0) goto cleanup; VIR_FREE(xmlstr); =20 - def->description =3D virXPathString("string(./Description)", ctxt); + def->common.description =3D virXPathString("string(./Description)"= , ctxt); =20 def->memory =3D VIR_DOMAIN_SNAPSHOT_LOCATION_NONE; xmlstr =3D virXPathString("string(./@state)", ctxt); --=20 1.8.3.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list