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

Reformat nodeStateCleanup 

Remove the ret variable and return early if there is no driver.
This commit is contained in:
Ján Tomko 2016-06-03 12:38:40 +02:00
parent 5c88b34afa
commit d85e29dd82
1 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/node_device/node_device_udev.c
View File

@ -1488,42 +1488,38 @@ static void udevPCITranslateDeinit(void)
static int nodeStateCleanup(void)
{
int ret = 0;
udevPrivate *priv = NULL;
struct udev_monitor *udev_monitor = NULL;
struct udev *udev = NULL;
if (driver) {
nodeDeviceLock();
if (!driver)
return -1;
priv = driver->privateData;
nodeDeviceLock();
if (priv->watch != -1)
virEventRemoveHandle(priv->watch);
priv = driver->privateData;
udev_monitor = DRV_STATE_UDEV_MONITOR(driver);
if (priv->watch != -1)
virEventRemoveHandle(priv->watch);
if (udev_monitor != NULL) {
udev = udev_monitor_get_udev(udev_monitor);
udev_monitor_unref(udev_monitor);
}
udev_monitor = DRV_STATE_UDEV_MONITOR(driver);
if (udev != NULL)
udev_unref(udev);
virNodeDeviceObjListFree(&driver->devs);
nodeDeviceUnlock();
virMutexDestroy(&driver->lock);
VIR_FREE(driver);
VIR_FREE(priv);
udevPCITranslateDeinit();
} else {
ret = -1;
if (udev_monitor != NULL) {
udev = udev_monitor_get_udev(udev_monitor);
udev_monitor_unref(udev_monitor);
}
return ret;
if (udev != NULL)
udev_unref(udev);
virNodeDeviceObjListFree(&driver->devs);
nodeDeviceUnlock();
virMutexDestroy(&driver->lock);
VIR_FREE(driver);
VIR_FREE(priv);
udevPCITranslateDeinit();
return 0;
}