提交 580dbf06 编写于 作者: J Jovanka Gulicoska 提交者: Cole Robinson

storage: Replace VIR_ERROR with standard vir*Error in state driver init

Replace VIR_ERROR with virReportError and virReportSystemError
上级 1433c803
...@@ -88,7 +88,8 @@ storagePoolUpdateState(virStoragePoolObjPtr pool) ...@@ -88,7 +88,8 @@ storagePoolUpdateState(virStoragePoolObjPtr pool)
goto error; goto error;
if ((backend = virStorageBackendForType(pool->def->type)) == NULL) { if ((backend = virStorageBackendForType(pool->def->type)) == NULL) {
VIR_ERROR(_("Missing backend %d"), pool->def->type); virReportError(VIR_ERR_INTERNAL_ERROR,
_("Missing backend %d"), pool->def->type);
goto error; goto error;
} }
...@@ -98,8 +99,9 @@ storagePoolUpdateState(virStoragePoolObjPtr pool) ...@@ -98,8 +99,9 @@ storagePoolUpdateState(virStoragePoolObjPtr pool)
active = false; active = false;
if (backend->checkPool && if (backend->checkPool &&
backend->checkPool(pool, &active) < 0) { backend->checkPool(pool, &active) < 0) {
VIR_ERROR(_("Failed to initialize storage pool '%s': %s"), virReportError(VIR_ERR_INTERNAL_ERROR,
pool->def->name, virGetLastErrorMessage()); _("Failed to initialize storage pool '%s': %s"),
pool->def->name, virGetLastErrorMessage());
goto error; goto error;
} }
...@@ -112,8 +114,9 @@ storagePoolUpdateState(virStoragePoolObjPtr pool) ...@@ -112,8 +114,9 @@ storagePoolUpdateState(virStoragePoolObjPtr pool)
if (backend->refreshPool(NULL, pool) < 0) { if (backend->refreshPool(NULL, pool) < 0) {
if (backend->stopPool) if (backend->stopPool)
backend->stopPool(NULL, pool); backend->stopPool(NULL, pool);
VIR_ERROR(_("Failed to restart storage pool '%s': %s"), virReportError(VIR_ERR_INTERNAL_ERROR,
pool->def->name, virGetLastErrorMessage()); _("Failed to restart storage pool '%s': %s"),
pool->def->name, virGetLastErrorMessage());
goto error; goto error;
} }
} }
...@@ -172,8 +175,9 @@ storageDriverAutostart(void) ...@@ -172,8 +175,9 @@ storageDriverAutostart(void)
!virStoragePoolObjIsActive(pool)) { !virStoragePoolObjIsActive(pool)) {
if (backend->startPool && if (backend->startPool &&
backend->startPool(conn, pool) < 0) { backend->startPool(conn, pool) < 0) {
VIR_ERROR(_("Failed to autostart storage pool '%s': %s"), virReportError(VIR_ERR_INTERNAL_ERROR,
pool->def->name, virGetLastErrorMessage()); _("Failed to autostart storage pool '%s': %s"),
pool->def->name, virGetLastErrorMessage());
virStoragePoolObjUnlock(pool); virStoragePoolObjUnlock(pool);
continue; continue;
} }
...@@ -193,8 +197,9 @@ storageDriverAutostart(void) ...@@ -193,8 +197,9 @@ storageDriverAutostart(void)
unlink(stateFile); unlink(stateFile);
if (backend->stopPool) if (backend->stopPool)
backend->stopPool(conn, pool); backend->stopPool(conn, pool);
VIR_ERROR(_("Failed to autostart storage pool '%s': %s"), virReportError(VIR_ERR_INTERNAL_ERROR,
pool->def->name, virGetLastErrorMessage()); _("Failed to autostart storage pool '%s': %s"),
pool->def->name, virGetLastErrorMessage());
} else { } else {
pool->active = true; pool->active = true;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册