From: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
Date: Fri, 18 Dec 2020 06:40:04 +0000 (+0300)
Subject: src: don't hide error in VIR_DRV_SUPPORTS_FEATURE
X-Git-Tag: v7.0.0-rc1~72
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3e883cf07e1a0db0ac3f8ed3eb63500f40f7deff;p=thirdparty%2Flibvirt.git

src: don't hide error in VIR_DRV_SUPPORTS_FEATURE

Otherwise we can get misleading error messages. One example is when connection
is broken we got "this function is not supported by the connection driver:
virDomainMigrate3" from virDomainMigrate3.

Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/src/driver.h b/src/driver.h
index 6278aa05b3..2531ac3382 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -47,17 +47,14 @@ typedef enum {
  * directly if you don't have to, because it may be NULL, use this macro
  * instead.
  *
- * Note that this treats a possible error returned by drv->supports_feature
- * the same as not supported. If you care about the error, call
- * drv->supports_feature directly.
- *
  * Returns:
- *   != 0  Feature is supported.
+ *   -1    Error
+ *   >0    Feature is supported.
  *   0     Feature is not supported.
  */
 #define VIR_DRV_SUPPORTS_FEATURE(drv, conn, feature) \
     ((drv)->connectSupportsFeature ? \
-        (drv)->connectSupportsFeature((conn), (feature)) > 0 : 0)
+        (drv)->connectSupportsFeature((conn), (feature)) : 0)
 
 
 #define __VIR_DRIVER_H_INCLUDES___