Re: [libvirt] [RFC PATCH 4/8] Snapshot internal methods.

Signed-off-by: Chris Lalancette <clalance(a)redhat.com&gt; ---  src/conf/domain_conf.c   |  402 ++++++++++++++++++++++++++++++++++++++++++++--  src/conf/domain_conf.h   |   53 ++++++  src/libvirt_private.syms |   10 ++  3 files changed, 455 insertions(+), 10 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e260dce..1971b9a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c

@@ -6096,22 +6101,25 @@ static virDomainObjPtr virDomainLoadConfig(virCapsPtr caps,     if ((configFile = virDomainConfigFile(configDir, name)) == NULL)         goto error; -    if ((autostartLink = virDomainConfigFile(autostartDir, name)) == NULL) -        goto error; - -    if ((autostart = virFileLinkPointsTo(autostartLink, configFile)) < 0) -        goto error; -     if (!(def = virDomainDefParseFile(caps, configFile,                                       VIR_DOMAIN_XML_INACTIVE)))         goto error; -    if ((dom = virDomainFindByName(doms, def->name))) { -        virDomainObjUnlock(dom); -        dom = NULL; -        newVM = 0; +    /* if the domain is already in our hashtable, we don't need to do +     * anything further +     */ +    if ((dom = virDomainFindByUUID(doms, def->uuid))) { +        VIR_FREE(configFile); +        virDomainDefFree(def); +        return dom;     } +    if ((autostartLink = virDomainConfigFile(autostartDir, name)) == NULL) +        goto error; + +    if ((autostart = virFileLinkPointsTo(autostartLink, configFile)) < 0) +        goto error; +     if (!(dom = virDomainAssignDef(caps, doms, def, false)))         goto error;

+virDomainSnapshotDefPtr virDomainSnapshotDefParseString(const char *xmlStr, +                                                        int newSnapshot) +{ +    xmlXPathContextPtr ctxt = NULL; +    xmlDocPtr xml = NULL; +    xmlNodePtr root; +    virDomainSnapshotDefPtr def = NULL; +    virDomainSnapshotDefPtr ret = NULL; +    char *creation = NULL, *state = NULL; +    struct timeval tv; +    struct tm time_info; +    char timestr[100]; + +    xml = virXMLParse(NULL, xmlStr, "domainsnapshot.xml"); +    if (!xml) { +        virDomainReportError(VIR_ERR_XML_ERROR, +                             "%s",_("failed to parse snapshot xml document")); +        return NULL; +    } + +    if ((root = xmlDocGetRootElement(xml)) == NULL) { +        virDomainReportError(VIR_ERR_INTERNAL_ERROR, +                              "%s", _("missing root element")); +        goto cleanup; +    } + +    if (!xmlStrEqual(root->name, BAD_CAST "domainsnapshot")) { +        virDomainReportError(VIR_ERR_INTERNAL_ERROR, +                              "%s", _("incorrect root element")); +        goto cleanup; +    } + +    ctxt = xmlXPathNewContext(xml); +    if (ctxt == NULL) { +        virReportOOMError(); +        goto cleanup; +    } + +    if (VIR_ALLOC(def) < 0) { +        virReportOOMError(); +        goto cleanup; +    } + +    ctxt->node = root; + +    def->name = virXPathString("string(./name)", ctxt); +    if (def->name == NULL) { +        /* make up a name */ +        gettimeofday(&tv, NULL); +        localtime_r(&tv.tv_sec, &time_info); +        strftime(timestr, sizeof(timestr), "%F_%T", &time_info); +        def->name = strdup(timestr); +    } +    if (def->name == NULL) { +        virReportOOMError(); +        goto cleanup; +    } + +    def->description = virXPathString("string(./description)", ctxt); + +    if (!newSnapshot) { +        creation = virXPathString("string(./creationTime)", ctxt);

+        if (creation == NULL) { +            /* there was no creation time in an existing snapshot; this +             * should never happen +             */ +            virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s", +                                 _("missing creationTime from existing snapshot")); +            goto cleanup; +        } + +        if (strptime(creation, "%Y-%m-%d_%T", &time_info) == NULL) { +            /* we saw a creation time we couldn't parse.  We shouldn't +             * ever see this, so throw an error +             */ +            virDomainReportError(VIR_ERR_INTERNAL_ERROR, +                                 _("Could not convert '%s' to a time value"), +                                 creation); +            goto cleanup; +        } +        def->creationTime = mktime(&time_info);

+        def->parent = virXPathString("string(./parent/name)", ctxt); + +        state = virXPathString("string(./state)", ctxt); +        if (state == NULL) { +            /* there was no state in an existing snapshot; this +             * should never happen +             */ +            virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s", +                                 _("missing state from existing snapshot")); +            goto cleanup; +        } +        def->state = virDomainStateTypeFromString(state); +        if (def->state < 0) { +            virDomainReportError(VIR_ERR_INTERNAL_ERROR, +                                 _("Invalid state '%s' in domain snapshot XML"), +                                 state); +            goto cleanup; +        } +    } +    else { +        gettimeofday(&tv, NULL); +        def->creationTime = tv.tv_sec; +    } + +    ret = def; + +cleanup: +    VIR_FREE(creation); +    VIR_FREE(state); +    if (ctxt) +        xmlXPathFreeContext(ctxt); +    if (ret == NULL) +        virDomainSnapshotDefFree(def); +    xmlFreeDoc(xml); + +    return ret; +} + +char *virDomainSnapshotDefFormat(char *domain_uuid, +                                 virDomainSnapshotDefPtr def) +{ +    virBuffer buf = VIR_BUFFER_INITIALIZER; +    char timestr[100]; +    struct tm time_info; + +    virBufferAddLit(&buf, "<domainsnapshot>\n"); +    virBufferVSprintf(&buf, "  <name>%s</name>\n", def->name); +    if (def->description) +        virBufferVSprintf(&buf, "  <description>%s</description>\n", +                          def->description); +    virBufferVSprintf(&buf, "  <state>%s</state>\n", +                      virDomainStateTypeToString(def->state)); +    if (def->parent) { +        virBufferAddLit(&buf, "  <parent>\n"); +        virBufferVSprintf(&buf, "    <name>%s</name>\n", def->parent); +        virBufferAddLit(&buf, "  </parent>\n"); +    } +    localtime_r(&def->creationTime, &time_info); +    strftime(timestr, sizeof(timestr), "%F_%T", &time_info);

+    virBufferVSprintf(&buf, "  <creationTime>%s</creationTime>\n", timestr);

+    virBufferAddLit(&buf, "  <domain>\n"); +    virBufferVSprintf(&buf, "    <uuid>%s</uuid>\n", domain_uuid); +    virBufferAddLit(&buf, "  </domain>\n"); +    virBufferAddLit(&buf, "</domainsnapshot>\n"); + +    if (virBufferError(&buf)) { +        virBufferFreeAndReset(&buf); +        virReportOOMError(); +        return NULL; +    } + +    return virBufferContentAndReset(&buf); +} +