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

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

Browse Source
This commit is contained in:
Jovanka Gulicoska 2016-06-07 17:59:56 +02:00 committed by Cole Robinson
parent ecb714de53
commit de48ee1d6c
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/uml/uml_driver.c
View File

@ -188,8 +188,8 @@ umlAutostartDomain(virDomainObjPtr vm,
ret = umlStartVMDaemon(data->conn, data->driver, vm, false); ret = umlStartVMDaemon(data->conn, data->driver, vm, false);
virDomainAuditStart(vm, "booted", ret >= 0); virDomainAuditStart(vm, "booted", ret >= 0);
if (ret < 0) { if (ret < 0) {
VIR_ERROR(_("Failed to autostart VM '%s': %s"), virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to autostart VM '%s': %s"),
vm->def->name, virGetLastErrorMessage()); vm->def->name, virGetLastErrorMessage());
} else { } else {
virObjectEventPtr event = virObjectEventPtr event =
virDomainEventLifecycleNewFromObj(vm, virDomainEventLifecycleNewFromObj(vm,
@ -535,15 +535,13 @@ umlStateInitialize(bool privileged,
goto error; goto error;
if ((uml_driver->inotifyFD = inotify_init()) < 0) { if ((uml_driver->inotifyFD = inotify_init()) < 0) {
VIR_ERROR(_("cannot initialize inotify")); virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("cannot initialize inotify"));
goto error; goto error;
} }
if (virFileMakePath(uml_driver->monitorDir) < 0) { if (virFileMakePath(uml_driver->monitorDir) < 0) {
char ebuf[1024]; virReportSystemError(errno, _("Failed to create monitor directory %s"),
VIR_ERROR(_("Failed to create monitor directory %s: %s"), uml_driver->monitorDir);
uml_driver->monitorDir,
virStrerror(errno, ebuf, sizeof(ebuf)));
goto error; goto error;
} }
@ -551,10 +549,8 @@ umlStateInitialize(bool privileged,
if (inotify_add_watch(uml_driver->inotifyFD, if (inotify_add_watch(uml_driver->inotifyFD,
uml_driver->monitorDir, uml_driver->monitorDir,
IN_CREATE | IN_MODIFY | IN_DELETE) < 0) { IN_CREATE | IN_MODIFY | IN_DELETE) < 0) {
char ebuf[1024]; virReportSystemError(errno, _("Failed to create inotify watch on %s"),
VIR_ERROR(_("Failed to create inotify watch on %s: %s"), uml_driver->monitorDir);
uml_driver->monitorDir,
virStrerror(errno, ebuf, sizeof(ebuf)));
goto error; goto error;
} }
@ -582,7 +578,7 @@ umlStateInitialize(bool privileged,
return 0; return 0;
out_of_memory: out_of_memory:
VIR_ERROR(_("umlStartup: out of memory")); virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("umlStartup: out of memory"));
error: error:
VIR_FREE(userdir); VIR_FREE(userdir);