vz: Fix return value in error path

[libvirt PATCH] vz: Fix return value in error path

Rikard Falkeborn posted 1 patch 4 years, 2 months ago

Download mbox

Test syntax-check failed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/20200222232247.192902-1-rikard.falkeborn@gmail.com

src/vz/vz_sdk.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

Expand all Fold all

[libvirt PATCH] vz: Fix return value in error path

Posted by Rikard Falkeborn 4 years, 2 months ago

If PrlVmDev_GetType(), PrlVmDev_GetIndex() or PrlVmCfg_GetBootDevCount()
fails, return false to indicate error. Returning -1 would be interpreted
as true when used in an if-statement.

Fixes: 8c9252aa6d95247537da0939b54fdd2f31695e32
Signed-off-by: Rikard Falkeborn <rikard.falkeborn@gmail.com>
---
 src/vz/vz_sdk.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
index 877692aeba..2c68c7cb27 100644
--- a/src/vz/vz_sdk.c
+++ b/src/vz/vz_sdk.c
@@ -1609,13 +1609,13 @@ prlsdkInBootList(PRL_HANDLE sdkdom,
     size_t i;
 
     pret = PrlVmDev_GetType(sdktargetdev, &targetType);
-    prlsdkCheckRetExit(pret, -1);
+    prlsdkCheckRetExit(pret, false);
 
     pret = PrlVmDev_GetIndex(sdktargetdev, &targetIndex);
-    prlsdkCheckRetExit(pret, -1);
+    prlsdkCheckRetExit(pret, false);
 
     pret = PrlVmCfg_GetBootDevCount(sdkdom, &bootNum);
-    prlsdkCheckRetExit(pret, -1);
+    prlsdkCheckRetExit(pret, false);
 
     for (i = 0; i < bootNum; ++i) {
         pret = PrlVmCfg_GetBootDev(sdkdom, i, &bootDev);
-- 
2.25.1

Re: [libvirt PATCH] vz: Fix return value in error path

Posted by Ján Tomko 4 years, 1 month ago

On Sun, Feb 23, 2020 at 12:22:47AM +0100, Rikard Falkeborn wrote:
>If PrlVmDev_GetType(), PrlVmDev_GetIndex() or PrlVmCfg_GetBootDevCount()
>fails, return false to indicate error. Returning -1 would be interpreted
>as true when used in an if-statement.
>
>Fixes: 8c9252aa6d95247537da0939b54fdd2f31695e32
>Signed-off-by: Rikard Falkeborn <rikard.falkeborn@gmail.com>
>---
> src/vz/vz_sdk.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>

Reviewed-by: Ján Tomko <jtomko@redhat.com>
and pushed

Jano