From e149443b8b39e35e5a7ad168596a4321d55307d7 Mon Sep 17 00:00:00 2001 From: Nikolay Shirokovskiy Date: Fri, 5 Apr 2019 17:50:13 +0300 Subject: [PATCH] vz: fixes: snapshot: Factor out virDomainMomentDef class Fix for commit ffc0fbebe refactoring snapshot code. Reviewed-by: Cole Robinson ACKed-by: Maxim Nestratov 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 3d57144a43..83bffd95b2 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -2619,7 +2619,7 @@ vzDomainSnapshotCreateXML(virDomainPtr domain, goto cleanup; /* snaphot name is ignored, it will be set to auto generated by sdk uuid */ - if (prlsdkCreateSnapshot(dom, def->description) < 0) + if (prlsdkCreateSnapshot(dom, def->common.description) < 0) goto cleanup; if (!(snapshots = prlsdkLoadSnapshots(dom))) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 883ed6a7f3..73d5c89c08 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -4696,14 +4696,14 @@ prlsdkParseSnapshotTree(const char *treexml) ctxt->node = nodes[i]; - def->name = virXPathString("string(./@guid)", ctxt); - if (!def->name) { + def->common.name = virXPathString("string(./@guid)", ctxt); + if (!def->common.name) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("missing 'guid' attribute")); goto cleanup; } - def->parent = virXPathString("string(../@guid)", ctxt); + def->common.parent = virXPathString("string(../@guid)", ctxt); xmlstr = virXPathString("string(./DateTime)", ctxt); if (!xmlstr) { @@ -4711,11 +4711,11 @@ prlsdkParseSnapshotTree(const char *treexml) _("missing 'DateTime' element")); goto cleanup; } - if ((def->creationTime = prlsdkParseDateTime(xmlstr)) < 0) + if ((def->common.creationTime = prlsdkParseDateTime(xmlstr)) < 0) goto cleanup; VIR_FREE(xmlstr); - def->description = virXPathString("string(./Description)", ctxt); + def->common.description = virXPathString("string(./Description)", ctxt); def->memory = VIR_DOMAIN_SNAPSHOT_LOCATION_NONE; xmlstr = virXPathString("string(./@state)", ctxt);