openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Initialize ret to -1 in nodeStateInitialize 

Most of the code paths had to reset it to -1 and returning 0 was
only possible if we made it to the end of the function.

Initialize it to -1 and only set it to 0 if we reach the end, as we do
in most of libvirt code.
This commit is contained in:
Ján Tomko 2016-06-03 10:21:23 +02:00
parent c0bc172383
commit b2a55dfd1f
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/node_device/node_device_udev.c
View File

@ -1680,7 +1680,7 @@ static int nodeStateInitialize(bool privileged,
{
udevPrivate *priv = NULL;
struct udev *udev = NULL;
int ret = 0;
int ret = -1;
#if defined __s390__ || defined __s390x_
/* On s390(x) system there is no PCI bus.
@ -1696,23 +1696,19 @@ static int nodeStateInitialize(bool privileged,
char ebuf[256];
VIR_ERROR(_("Failed to initialize libpciaccess: %s"),
virStrerror(pciret, ebuf, sizeof(ebuf)));
ret = -1;
goto out;
}
}
#endif
if (VIR_ALLOC(priv) < 0) {
ret = -1;
if (VIR_ALLOC(priv) < 0)
goto out;
}
priv->watch = -1;
priv->privileged = privileged;
if (VIR_ALLOC(driver) < 0) {
VIR_FREE(priv);
ret = -1;
goto out;
}
@ -1720,7 +1716,6 @@ static int nodeStateInitialize(bool privileged,
VIR_ERROR(_("Failed to initialize mutex for driver"));
VIR_FREE(priv);
VIR_FREE(driver);
ret = -1;
goto out;
}
@ -1742,7 +1737,6 @@ static int nodeStateInitialize(bool privileged,
if (priv->udev_monitor == NULL) {
VIR_FREE(priv);
VIR_ERROR(_("udev_monitor_new_from_netlink returned NULL"));
ret = -1;
goto out_unlock;
}
@ -1762,23 +1756,19 @@ static int nodeStateInitialize(bool privileged,
priv->watch = virEventAddHandle(udev_monitor_get_fd(priv->udev_monitor),
VIR_EVENT_HANDLE_READABLE,
udevEventHandleCallback, NULL, NULL);
if (priv->watch == -1) {
ret = -1;
if (priv->watch == -1)
goto out_unlock;
}
/* Create a fictional 'computer' device to root the device tree. */
if (udevSetupSystemDev() != 0) {
ret = -1;
if (udevSetupSystemDev() != 0)
goto out_unlock;
}
/* Populate with known devices */
if (udevEnumerateDevices(udev) != 0) {
ret = -1;
if (udevEnumerateDevices(udev) != 0)
goto out_unlock;
}
ret = 0;
out_unlock:
nodeDeviceUnlock();