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

node_device: remove unneeded cleanup labels

Browse Source 
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Daniel Henrique Barboza 2019-10-21 15:18:56 -03:00 committed by Ján Tomko
parent 64b8d27e9a
commit 5231b480d4
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/node_device/node_device_driver.c
View File

@ -587,20 +587,15 @@ int
nodeConnectNodeDeviceEventDeregisterAny(virConnectPtr conn, nodeConnectNodeDeviceEventDeregisterAny(virConnectPtr conn,
int callbackID) int callbackID)
{ {
int ret = -1;
if (virConnectNodeDeviceEventDeregisterAnyEnsureACL(conn) < 0) if (virConnectNodeDeviceEventDeregisterAnyEnsureACL(conn) < 0)
goto cleanup; return -1;
if (virObjectEventStateDeregisterID(conn, if (virObjectEventStateDeregisterID(conn,
driver->nodeDeviceEventState, driver->nodeDeviceEventState,
callbackID, true) < 0) callbackID, true) < 0)
goto cleanup; return -1;
ret = 0; return 0;
cleanup:
return ret;
} }
int int

8
src/node_device/node_device_udev.c
View File

@ -1259,7 +1259,6 @@ udevSetParent(struct udev_device *device,
const char *parent_sysfs_path = NULL; const char *parent_sysfs_path = NULL;
virNodeDeviceObjPtr obj = NULL; virNodeDeviceObjPtr obj = NULL;
virNodeDeviceDefPtr objdef; virNodeDeviceDefPtr objdef;
int ret = -1;
parent_device = device; parent_device = device;
do { do {
@ -1273,7 +1272,7 @@ udevSetParent(struct udev_device *device,
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("Could not get syspath for parent of '%s'"), _("Could not get syspath for parent of '%s'"),
udev_device_get_syspath(parent_device)); udev_device_get_syspath(parent_device));
goto cleanup; return -1;
} }
if ((obj = virNodeDeviceObjListFindBySysfsPath(driver->devs, if ((obj = virNodeDeviceObjListFindBySysfsPath(driver->devs,
@ -1290,10 +1289,7 @@ udevSetParent(struct udev_device *device,
if (!def->parent) if (!def->parent)
def->parent = g_strdup("computer"); def->parent = g_strdup("computer");
ret = 0; return 0;
cleanup:
return ret;
} }