[PATCH] qemuBlockDiskDetectNodes: just return when alias is null

[Ján Tomko]

On a Thursday in 2021, Yi Li wrote:
>Just Return when alias is null and Remove the 'ret' variable.
>
>Signed-off-by: Yi Li <yili at winhong.com>
>---
> src/qemu/qemu_block.c | 21 ++++++++-------------
> 1 file changed, 8 insertions(+), 13 deletions(-)
>
>diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
>index 0b8ca2a3f5..32b6500a3d 100644
>--- a/src/qemu/qemu_block.c
>+++ b/src/qemu/qemu_block.c
>@@ -280,25 +280,22 @@ qemuBlockDiskDetectNodes(virDomainDiskDefPtr disk,
>     qemuBlockNodeNameBackingChainDataPtr entry = NULL;
>     virStorageSourcePtr src = disk->src;
>     g_autofree char *alias = NULL;
>-    int ret = -1;
>
>     /* don't attempt the detection if the top level already has node names */
>     if (src->nodeformat || src->nodestorage)
>         return 0;
>
>     if (!(alias = qemuAliasDiskDriveFromDisk(disk)))
>-        goto cleanup;
>+        return 0;

Before, 'ret' was set to -1 and jumping to cleanup skipped over the
other assignment. This should be return -1

Jano

>
>-    if (!(entry = virHashLookup(disktable, alias))) {
>-        ret = 0;
>-        goto cleanup;
>-    }
>+    if (!(entry = virHashLookup(disktable, alias)))
>+        return 0;
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20210217/06c3cf85/attachment-0001.sig>