Most of the code base is fairly consistent about using the name 'uuidstr' when dealing with a formatted human-readable form, and 'uuid' when dealing with the smaller raw bytes form. Fix snapshot_conf to comply, as well as reducing the scope of a human string to only the error message that needs it. Signed-off-by: Eric Blake <eblake(a)redhat.com&gt; --- Pushing this one under the trivial rule. src/conf/snapshot_conf.h | 2 +- src/conf/snapshot_conf.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/conf/snapshot_conf.h b/src/conf/snapshot_conf.h index cc25164261..7a175dfc96 100644 --- a/src/conf/snapshot_conf.h +++ b/src/conf/snapshot_conf.h @@ -111,7 +111,7 @@ virDomainSnapshotDefPtr virDomainSnapshotDefParseNode(xmlDocPtr xml, virDomainXMLOptionPtr xmlopt, unsigned int flags); void virDomainSnapshotDefFree(virDomainSnapshotDefPtr def); -char *virDomainSnapshotDefFormat(const char *domain_uuid, +char *virDomainSnapshotDefFormat(const char *uuidstr, virDomainSnapshotDefPtr def, virCapsPtr caps, virDomainXMLOptionPtr xmlopt, diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index 1afc7de30c..489c25f511 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -688,7 +688,7 @@ virDomainSnapshotDiskDefFormat(virBufferPtr buf, char * -virDomainSnapshotDefFormat(const char *domain_uuid, +virDomainSnapshotDefFormat(const char *uuidstr, virDomainSnapshotDefPtr def, virCapsPtr caps, virDomainXMLOptionPtr xmlopt, @@ -744,10 +744,10 @@ virDomainSnapshotDefFormat(const char *domain_uuid, if (def->dom) { if (virDomainDefFormatInternal(def->dom, caps, flags, &buf, xmlopt) < 0) goto error; - } else if (domain_uuid) { + } else if (uuidstr) { virBufferAddLit(&buf, "<domain>\n"); virBufferAdjustIndent(&buf, 2); - virBufferAsprintf(&buf, "<uuid>%s</uuid>\n", domain_uuid); + virBufferAsprintf(&buf, "<uuid>%s</uuid>\n", uuidstr); virBufferAdjustIndent(&buf, -2); virBufferAddLit(&buf, "</domain>\n"); } @@ -1224,11 +1224,8 @@ virDomainSnapshotRedefinePrep(virDomainPtr domain, int ret = -1; int align_location = VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL; bool align_match = true; - char uuidstr[VIR_UUID_STRING_BUFLEN]; virDomainSnapshotObjPtr other; - virUUIDFormat(domain->uuid, uuidstr); - /* Prevent circular chains */ if (def->parent) { if (STREQ(def->name, def->parent)) { @@ -1274,6 +1271,9 @@ virDomainSnapshotRedefinePrep(virDomainPtr domain, if (def->dom && memcmp(def->dom->uuid, domain->uuid, VIR_UUID_BUFLEN)) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + + virUUIDFormat(domain->uuid, uuidstr); virReportError(VIR_ERR_INVALID_ARG, _("definition for snapshot %s must use uuid %s"), def->name, uuidstr); -- 2.20.1