mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-28 11:31:16 +00:00
storage: netfs and iscsi need option srcSpec for resource discovery
The option 'srcSpec' to virsh command find-storage-pool-sources is optional for logical type of storage pool, but mandatory for netfs and iscsi type. When missing the option for netfs and iscsi, libvirt reports XML parsing error due to null string option srcSpec. before error: Failed to find any netfs pool sources error: (storage_source_specification):1: Document is empty (null) after: error: pool type 'iscsi' requires option --srcSpec for source discovery
This commit is contained in:
parent
57fb8d5336
commit
4057048891
@ -2648,23 +2648,11 @@ remoteFindStoragePoolSources (virConnectPtr conn,
|
||||
remote_find_storage_pool_sources_args args;
|
||||
remote_find_storage_pool_sources_ret ret;
|
||||
struct private_data *priv = conn->storagePrivateData;
|
||||
const char *emptyString = "";
|
||||
|
||||
remoteDriverLock(priv);
|
||||
|
||||
args.type = (char*)type;
|
||||
/*
|
||||
* I'd think the following would work here:
|
||||
* args.srcSpec = (char**)&srcSpec;
|
||||
* since srcSpec is a remote_string (not a remote_nonnull_string).
|
||||
*
|
||||
* But when srcSpec is NULL, this yields:
|
||||
* libvir: Remote error : marshaling args
|
||||
*
|
||||
* So for now I'm working around this by turning NULL srcSpecs
|
||||
* into empty strings.
|
||||
*/
|
||||
args.srcSpec = srcSpec ? (char **)&srcSpec : (char **)&emptyString;
|
||||
args.srcSpec = srcSpec ? (char **)&srcSpec : NULL;
|
||||
args.flags = flags;
|
||||
|
||||
memset (&ret, 0, sizeof(ret));
|
||||
|
@ -258,10 +258,15 @@ virStorageBackendFileSystemNetFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSE
|
||||
|
||||
virCheckFlags(0, NULL);
|
||||
|
||||
source = virStoragePoolDefParseSourceString(srcSpec,
|
||||
VIR_STORAGE_POOL_NETFS);
|
||||
if (!source)
|
||||
goto cleanup;
|
||||
if (!srcSpec) {
|
||||
virReportError(VIR_ERR_INVALID_ARG,
|
||||
"%s", _("hostname must be specified for netfs sources"));
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (!(source = virStoragePoolDefParseSourceString(srcSpec,
|
||||
VIR_STORAGE_POOL_NETFS)))
|
||||
return NULL;
|
||||
|
||||
if (source->nhost != 1) {
|
||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
|
||||
|
@ -582,6 +582,13 @@ virStorageBackendISCSIFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSED,
|
||||
|
||||
virCheckFlags(0, NULL);
|
||||
|
||||
if (!srcSpec) {
|
||||
virReportError(VIR_ERR_INVALID_ARG,
|
||||
"%s", _("hostname and device path "
|
||||
"must be specified for iscsi sources"));
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (!(source = virStoragePoolDefParseSourceString(srcSpec,
|
||||
list.type)))
|
||||
return NULL;
|
||||
|
Loading…
Reference in New Issue
Block a user