NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-13 00:46:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Change return value of VIR_DRV_SUPPORTS_FEATURE to bool

Browse Source 
virDrvSupportsFeature API is allowed to return -1 on error while all but
one uses of VIR_DRV_SUPPORTS_FEATURE only check for (non)zero return
value. Let's make this macro return zero on error, which is what
everyone expects anyway.
This commit is contained in:
Jiri Denemark 2010-12-03 09:31:48 +01:00
parent ccf2d0847b
commit 4186f92935
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/driver.h
View File

@ -47,17 +47,20 @@ typedef enum {
/* Internal feature-detection macro. Don't call drv->supports_feature
* directly, because it may be NULL, use this macro instead.
* directly if you don't have to, because it may be NULL, use this macro
* instead.
*
* Note that you must check for errors.
* 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:
* >= 1 Feature is supported.
* != 0 Feature is supported.
* 0 Feature is not supported.
* -1 Error.
*/
# define VIR_DRV_SUPPORTS_FEATURE(drv,conn,feature) \
((drv)->supports_feature ? (drv)->supports_feature((conn),(feature)) : 0)
# define VIR_DRV_SUPPORTS_FEATURE(drv,conn,feature) \
((drv)->supports_feature ? \
(drv)->supports_feature((conn), (feature)) > 0 : 0)
typedef virDrvOpenStatus
(*virDrvOpen) (virConnectPtr conn,

5
src/libvirt.c
View File

@ -1605,7 +1605,10 @@ virDrvSupportsFeature (virConnectPtr conn, int feature)
return (-1);
}
ret = VIR_DRV_SUPPORTS_FEATURE (conn->driver, conn, feature);
if (!conn->driver->supports_feature)
ret = 0;
else
ret = conn->driver->supports_feature(conn, feature);
if (ret < 0)
virDispatchError(conn);