virCapabilitiesHostNUMAInitReal: Don't jump over cleanup

[PATCH for 7.4.0] virCapabilitiesHostNUMAInitReal: Don't jump over cleanup

Michal Privoznik posted 1 patch 2 years, 11 months ago

Download mbox

Test syntax-check failed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/2ae61b3eaf83e32654da7c03180954d0443e2b8f.1622108800.git.mprivozn@redhat.com

src/conf/capabilities.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Expand all Fold all

[PATCH for 7.4.0] virCapabilitiesHostNUMAInitReal: Don't jump over cleanup

Posted by Michal Privoznik 2 years, 11 months ago

In one of my recent commits I've done some renaming. But whilst
doing so I also mistakenly replaced 'goto cleanup' with 'return
-1' in virCapabilitiesHostNUMAInitReal() which was incorrect.

Fixes: fe25224fdaa53bbeceed3ddeef1b3a150665e656
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 src/conf/capabilities.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index 1290c9c15d..2f9a1e7d1f 100644
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -1623,7 +1623,7 @@ virCapabilitiesHostNUMAInitReal(virCapsHostNUMA *caps)
         }
 
         if (virCapabilitiesGetNUMADistances(n, &distances, &ndistances) < 0)
-            return -1;
+            goto cleanup;
 
         if (virCapabilitiesGetNUMAPagesInfo(n, &pageinfo, &npageinfo) < 0)
             goto cleanup;
-- 
2.31.1

Re: [PATCH for 7.4.0] virCapabilitiesHostNUMAInitReal: Don't jump over cleanup

Posted by Martin Kletzander 2 years, 11 months ago

On Thu, May 27, 2021 at 11:46:56AM +0200, Michal Privoznik wrote:
>In one of my recent commits I've done some renaming. But whilst
>doing so I also mistakenly replaced 'goto cleanup' with 'return
>-1' in virCapabilitiesHostNUMAInitReal() which was incorrect.
>
>Fixes: fe25224fdaa53bbeceed3ddeef1b3a150665e656
>Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
>---

Reviewed-by: Martin Kletzander <mkletzan@redhat.com>

and SFF

> src/conf/capabilities.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
>index 1290c9c15d..2f9a1e7d1f 100644
>--- a/src/conf/capabilities.c
>+++ b/src/conf/capabilities.c
>@@ -1623,7 +1623,7 @@ virCapabilitiesHostNUMAInitReal(virCapsHostNUMA *caps)
>         }
>
>         if (virCapabilitiesGetNUMADistances(n, &distances, &ndistances) < 0)
>-            return -1;
>+            goto cleanup;
>
>         if (virCapabilitiesGetNUMAPagesInfo(n, &pageinfo, &npageinfo) < 0)
>             goto cleanup;
>-- 
>2.31.1
>