From fcf0fd52cba1fef113bde7d41c036ead9e2b103b Mon Sep 17 00:00:00 2001 From: John Ferlan Date: Tue, 2 Jun 2015 16:25:58 -0400 Subject: [PATCH] storage: FS backend adjust error message on error path https://bugzilla.redhat.com/show_bug.cgi?id=1181087 Currently the assumption on the error message is that there are no source device paths defined when the number of devices check fails, but in reality the XML could have had none or it could have had more than the value supported. Adjust the error message accordingly to make it clearer what the error really is. --- src/storage/storage_backend_fs.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index c9f25de182..ed3964bbbd 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -362,8 +362,13 @@ virStorageBackendFileSystemIsValid(virStoragePoolObjPtr pool) } } else { if (pool->def->source.ndevice != 1) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("missing source device")); + if (pool->def->source.ndevice == 0) + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("missing source device")); + else + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("expected exactly 1 device for the " + "storage pool")); return -1; } }