NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

conf: Rework virStoragePoolDefParseXML

Browse Source 
Rather than having an error path, let's rework the code to allocate
and fill into an @def variable and then steal that into @ret when we
are successful leaving just a cleanup: path.

Signed-off-by: John Ferlan <jferlan@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
John Ferlan 2019-02-07 18:41:58 -05:00
parent 1f20da92d8
commit 6bf74e3199
1 changed files with 56 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
src/conf/storage_conf.c
View File

@ -737,159 +737,157 @@ virStoragePoolDefPtr
virStoragePoolDefParseXML(xmlXPathContextPtr ctxt) virStoragePoolDefParseXML(xmlXPathContextPtr ctxt)
{ {
virStoragePoolOptionsPtr options; virStoragePoolOptionsPtr options;
virStoragePoolDefPtr ret; virStoragePoolDefPtr def;
virStoragePoolDefPtr ret = NULL;
xmlNodePtr source_node; xmlNodePtr source_node;
char *type = NULL; char *type = NULL;
char *uuid = NULL; char *uuid = NULL;
char *target_path = NULL; char *target_path = NULL;
if (VIR_ALLOC(ret) < 0) if (VIR_ALLOC(def) < 0)
return NULL; return NULL;
type = virXPathString("string(./@type)", ctxt); type = virXPathString("string(./@type)", ctxt);
if (type == NULL) { if (type == NULL) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("storage pool missing type attribute")); _("storage pool missing type attribute"));
goto error; goto cleanup;
} }
if ((ret->type = virStoragePoolTypeFromString(type)) < 0) { if ((def->type = virStoragePoolTypeFromString(type)) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown storage pool type %s"), type); _("unknown storage pool type %s"), type);
goto error; goto cleanup;
} }
if ((options = virStoragePoolOptionsForPoolType(ret->type)) == NULL) if ((options = virStoragePoolOptionsForPoolType(def->type)) == NULL)
goto error; goto cleanup;
source_node = virXPathNode("./source", ctxt); source_node = virXPathNode("./source", ctxt);
if (source_node) { if (source_node) {
if (virStoragePoolDefParseSource(ctxt, &ret->source, ret->type, if (virStoragePoolDefParseSource(ctxt, &def->source, def->type,
source_node) < 0) source_node) < 0)
goto error; goto cleanup;
} else { } else {
if (options->formatFromString) if (options->formatFromString)
ret->source.format = options->defaultFormat; def->source.format = options->defaultFormat;
} }
ret->name = virXPathString("string(./name)", ctxt); def->name = virXPathString("string(./name)", ctxt);
if (ret->name == NULL && if (def->name == NULL &&
options->flags & VIR_STORAGE_POOL_SOURCE_NAME && options->flags & VIR_STORAGE_POOL_SOURCE_NAME &&
VIR_STRDUP(ret->name, ret->source.name) < 0) VIR_STRDUP(def->name, def->source.name) < 0)
goto error; goto cleanup;
if (ret->name == NULL) { if (def->name == NULL) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("missing pool source name element")); _("missing pool source name element"));
goto error; goto cleanup;
} }
if (strchr(ret->name, '/')) { if (strchr(def->name, '/')) {
virReportError(VIR_ERR_XML_ERROR, virReportError(VIR_ERR_XML_ERROR,
_("name %s cannot contain '/'"), ret->name); _("name %s cannot contain '/'"), def->name);
goto error; goto cleanup;
} }
uuid = virXPathString("string(./uuid)", ctxt); uuid = virXPathString("string(./uuid)", ctxt);
if (uuid == NULL) { if (uuid == NULL) {
if (virUUIDGenerate(ret->uuid) < 0) { if (virUUIDGenerate(def->uuid) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("unable to generate uuid")); _("unable to generate uuid"));
goto error; goto cleanup;
} }
} else { } else {
if (virUUIDParse(uuid, ret->uuid) < 0) { if (virUUIDParse(uuid, def->uuid) < 0) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("malformed uuid element")); _("malformed uuid element"));
goto error; goto cleanup;
} }
} }
if (options->flags & VIR_STORAGE_POOL_SOURCE_HOST) { if (options->flags & VIR_STORAGE_POOL_SOURCE_HOST) {
if (!ret->source.nhost) { if (!def->source.nhost) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("missing storage pool source host name")); _("missing storage pool source host name"));
goto error; goto cleanup;
} }
} }
if (options->flags & VIR_STORAGE_POOL_SOURCE_DIR) { if (options->flags & VIR_STORAGE_POOL_SOURCE_DIR) {
if (!ret->source.dir) { if (!def->source.dir) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("missing storage pool source path")); _("missing storage pool source path"));
goto error; goto cleanup;
} }
} }
if (options->flags & VIR_STORAGE_POOL_SOURCE_NAME) { if (options->flags & VIR_STORAGE_POOL_SOURCE_NAME) {
if (ret->source.name == NULL) { if (def->source.name == NULL) {
/* source name defaults to pool name */ /* source name defaults to pool name */
if (VIR_STRDUP(ret->source.name, ret->name) < 0) if (VIR_STRDUP(def->source.name, def->name) < 0)
goto error; goto cleanup;
} }
} }
if ((options->flags & VIR_STORAGE_POOL_SOURCE_ADAPTER) && if ((options->flags & VIR_STORAGE_POOL_SOURCE_ADAPTER) &&
(virStorageAdapterValidate(&ret->source.adapter)) < 0) (virStorageAdapterValidate(&def->source.adapter)) < 0)
goto error; goto cleanup;
/* If DEVICE is the only source type, then its required */ /* If DEVICE is the only source type, then its required */
if (options->flags == VIR_STORAGE_POOL_SOURCE_DEVICE) { if (options->flags == VIR_STORAGE_POOL_SOURCE_DEVICE) {
if (!ret->source.ndevice) { if (!def->source.ndevice) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("missing storage pool source device name")); _("missing storage pool source device name"));
goto error; goto cleanup;
} }
} }
/* When we are working with a virtual disk we can skip the target /* When we are working with a virtual disk we can skip the target
* path and permissions */ * path and permissions */
if (!(options->flags & VIR_STORAGE_POOL_SOURCE_NETWORK)) { if (!(options->flags & VIR_STORAGE_POOL_SOURCE_NETWORK)) {
if (ret->type == VIR_STORAGE_POOL_LOGICAL) { if (def->type == VIR_STORAGE_POOL_LOGICAL) {
if (virAsprintf(&target_path, "/dev/%s", ret->source.name) < 0) if (virAsprintf(&target_path, "/dev/%s", def->source.name) < 0)
goto error; goto cleanup;
} else if (ret->type == VIR_STORAGE_POOL_ZFS) { } else if (def->type == VIR_STORAGE_POOL_ZFS) {
if (virAsprintf(&target_path, "/dev/zvol/%s", ret->source.name) < 0) if (virAsprintf(&target_path, "/dev/zvol/%s", def->source.name) < 0)
goto error; goto cleanup;
} else { } else {
target_path = virXPathString("string(./target/path)", ctxt); target_path = virXPathString("string(./target/path)", ctxt);
if (!target_path) { if (!target_path) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("missing storage pool target path")); _("missing storage pool target path"));
goto error; goto cleanup;
} }
} }
ret->target.path = virFileSanitizePath(target_path); def->target.path = virFileSanitizePath(target_path);
if (!ret->target.path) if (!def->target.path)
goto error; goto cleanup;
if (virStorageDefParsePerms(ctxt, &ret->target.perms, if (virStorageDefParsePerms(ctxt, &def->target.perms,
"./target/permissions") < 0) "./target/permissions") < 0)
goto error; goto cleanup;
} }
if (ret->type == VIR_STORAGE_POOL_ISCSI_DIRECT && if (def->type == VIR_STORAGE_POOL_ISCSI_DIRECT &&
!ret->source.initiator.iqn) { !def->source.initiator.iqn) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("missing initiator IQN")); _("missing initiator IQN"));
goto error; goto cleanup;
} }
/* Make a copy of all the callback pointers here for easier use, /* Make a copy of all the callback pointers here for easier use,
* especially during the virStoragePoolSourceClear method */ * especially during the virStoragePoolSourceClear method */
ret->ns = options->ns; def->ns = options->ns;
if (ret->ns.parse && if (def->ns.parse &&
(ret->ns.parse)(ctxt, &ret->namespaceData) < 0) (def->ns.parse)(ctxt, &def->namespaceData) < 0)
goto error; goto cleanup;
VIR_STEAL_PTR(ret, def);
cleanup: cleanup:
virStoragePoolDefFree(def);
VIR_FREE(uuid); VIR_FREE(uuid);
VIR_FREE(type); VIR_FREE(type);
VIR_FREE(target_path); VIR_FREE(target_path);
return ret; return ret;
error:
virStoragePoolDefFree(ret);
ret = NULL;
goto cleanup;
} }