External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 21:55:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jovanka Gulicoska 2016-06-08 15:20:27 +02:00 committed by Cole Robinson
parent 5ec2b0cca5
commit 609ba3a751
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/node_device/node_device_hal.c
View File

@ -641,7 +641,8 @@ nodeStateInitialize(bool privileged ATTRIBUTE_UNUSED,
dbus_error_init(&err); dbus_error_init(&err);
if (!(sysbus = virDBusGetSystemBus())) { if (!(sysbus = virDBusGetSystemBus())) {
VIR_ERROR(_("DBus not available, disabling HAL driver: %s"), virReportError(VIR_ERR_INTERNAL_ERROR,
_("DBus not available, disabling HAL driver: %s"),
virGetLastErrorMessage()); virGetLastErrorMessage());
ret = 0; ret = 0;
goto failure; goto failure;
@ -649,16 +650,20 @@ nodeStateInitialize(bool privileged ATTRIBUTE_UNUSED,
hal_ctx = libhal_ctx_new(); hal_ctx = libhal_ctx_new();
if (hal_ctx == NULL) { if (hal_ctx == NULL) {
VIR_ERROR(_("libhal_ctx_new returned NULL")); virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("libhal_ctx_new returned NULL"));
goto failure; goto failure;
} }
if (!libhal_ctx_set_dbus_connection(hal_ctx, sysbus)) { if (!libhal_ctx_set_dbus_connection(hal_ctx, sysbus)) {
VIR_ERROR(_("libhal_ctx_set_dbus_connection failed")); virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("libhal_ctx_set_dbus_connection failed"));
goto failure; goto failure;
} }
if (!libhal_ctx_init(hal_ctx, &err)) { if (!libhal_ctx_init(hal_ctx, &err)) {
VIR_ERROR(_("libhal_ctx_init failed, haldaemon is probably not running")); virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("libhal_ctx_init failed, haldaemon is probably "
"not running"));
/* We don't want to show a fatal error here, /* We don't want to show a fatal error here,
otherwise entire libvirtd shuts down when otherwise entire libvirtd shuts down when
hald isn't running */ hald isn't running */
@ -683,13 +688,15 @@ nodeStateInitialize(bool privileged ATTRIBUTE_UNUSED,
!libhal_ctx_set_device_lost_capability(hal_ctx, device_cap_lost) || !libhal_ctx_set_device_lost_capability(hal_ctx, device_cap_lost) ||
!libhal_ctx_set_device_property_modified(hal_ctx, device_prop_modified) || !libhal_ctx_set_device_property_modified(hal_ctx, device_prop_modified) ||
!libhal_device_property_watch_all(hal_ctx, &err)) { !libhal_device_property_watch_all(hal_ctx, &err)) {
VIR_ERROR(_("setting up HAL callbacks failed")); virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("setting up HAL callbacks failed"));
goto failure; goto failure;
} }
udi = libhal_get_all_devices(hal_ctx, &num_devs, &err); udi = libhal_get_all_devices(hal_ctx, &num_devs, &err);
if (udi == NULL) { if (udi == NULL) {
VIR_ERROR(_("libhal_get_all_devices failed")); virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("libhal_get_all_devices failed"));
goto failure; goto failure;
} }
for (i = 0; i < num_devs; i++) { for (i = 0; i < num_devs; i++) {
@ -702,7 +709,8 @@ nodeStateInitialize(bool privileged ATTRIBUTE_UNUSED,
failure: failure:
if (dbus_error_is_set(&err)) { if (dbus_error_is_set(&err)) {
VIR_ERROR(_("%s: %s"), err.name, err.message); virReportError(VIR_ERR_INTERNAL_ERROR,
_("%s: %s"), err.name, err.message);
dbus_error_free(&err); dbus_error_free(&err);
} }
virNodeDeviceObjListFree(&driver->devs); virNodeDeviceObjListFree(&driver->devs);
@ -753,7 +761,8 @@ nodeStateReload(void)
dbus_error_init(&err); dbus_error_init(&err);
udi = libhal_get_all_devices(hal_ctx, &num_devs, &err); udi = libhal_get_all_devices(hal_ctx, &num_devs, &err);
if (udi == NULL) { if (udi == NULL) {
VIR_ERROR(_("libhal_get_all_devices failed")); virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("libhal_get_all_devices failed"));
return -1; return -1;
} }
for (i = 0; i < num_devs; i++) { for (i = 0; i < num_devs; i++) {