External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-02 01:45:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

node_device_udev: Don't overwrite @ret in udevProcessStorage()

Browse Source 
Let's use a different variable for storing retvals of helper
functions. This way the usual function pattern can be restored.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Michal Privoznik 2021-05-31 16:22:42 +02:00
parent 950a9b256b
commit 791b1173d0
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/node_device/node_device_udev.c
View File

@ -927,6 +927,7 @@ udevProcessStorage(struct udev_device *device,
{ {
virNodeDevCapStorage *storage = &def->caps->data.storage; virNodeDevCapStorage *storage = &def->caps->data.storage;
int ret = -1; int ret = -1;
int rv;
const char* devnode; const char* devnode;
devnode = udev_device_get_devnode(device); devnode = udev_device_get_devnode(device);
@ -971,22 +972,26 @@ udevProcessStorage(struct udev_device *device,
} }
if (STREQ(def->caps->data.storage.drive_type, "cd")) { if (STREQ(def->caps->data.storage.drive_type, "cd")) {
ret = udevProcessCDROM(device, def); rv = udevProcessCDROM(device, def);
} else if (STREQ(def->caps->data.storage.drive_type, "disk")) { } else if (STREQ(def->caps->data.storage.drive_type, "disk")) {
ret = udevProcessDisk(device, def); rv = udevProcessDisk(device, def);
} else if (STREQ(def->caps->data.storage.drive_type, "floppy")) { } else if (STREQ(def->caps->data.storage.drive_type, "floppy")) {
ret = udevProcessFloppy(device, def); rv = udevProcessFloppy(device, def);
} else if (STREQ(def->caps->data.storage.drive_type, "sd")) { } else if (STREQ(def->caps->data.storage.drive_type, "sd")) {
ret = udevProcessSD(device, def); rv = udevProcessSD(device, def);
} else if (STREQ(def->caps->data.storage.drive_type, "dasd")) { } else if (STREQ(def->caps->data.storage.drive_type, "dasd")) {
ret = udevProcessDASD(device, def); rv = udevProcessDASD(device, def);
} else { } else {
VIR_DEBUG("Unsupported storage type '%s'", VIR_DEBUG("Unsupported storage type '%s'",
def->caps->data.storage.drive_type); def->caps->data.storage.drive_type);
goto cleanup; goto cleanup;
} }
if (rv < 0)
goto cleanup;
udevGenerateDeviceName(device, def, storage->serial); udevGenerateDeviceName(device, def, storage->serial);
ret = 0;
cleanup: cleanup:
VIR_DEBUG("Storage ret=%d", ret); VIR_DEBUG("Storage ret=%d", ret);