util: Add functions to simplify bool->virTristate(Bool|Switch) assignment

virTristateBoolFromBool and virTristateSwitchFromBool convert a boolean
to the correct enum value.

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 7a12d6a14666524bf54160ed87c92c365e2b05f9..9243c5591042c6a36c58b6bdda737e47355e52ee 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2950,8 +2950,10 @@ virSetNonBlock;
 virSetSockReuseAddr;
 virSetUIDGID;
 virSetUIDGIDWithCaps;
+virTristateBoolFromBool;
 virTristateBoolTypeFromString;
 virTristateBoolTypeToString;
+virTristateSwitchFromBool;
 virTristateSwitchTypeFromString;
 virTristateSwitchTypeToString;
 virUpdateSelfLastChanged;

diff --git a/src/util/virutil.c b/src/util/virutil.c
index e08f9fa4ad1b4eeb6d1f55cc146e8c875eef279a..170e921920efbf9f8ff2d5b2f15c6c938c704a6e 100644 (file)
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -100,6 +100,26 @@ VIR_ENUM_IMPL(virTristateSwitch, VIR_TRISTATE_SWITCH_LAST,
               "off")
 
 
+virTristateBool
+virTristateBoolFromBool(bool val)
+{
+    if (val)
+        return VIR_TRISTATE_BOOL_YES;
+    else
+        return VIR_TRISTATE_BOOL_NO;
+}
+
+
+virTristateSwitch
+virTristateSwitchFromBool(bool val)
+{
+    if (val)
+        return VIR_TRISTATE_SWITCH_ON;
+    else
+        return VIR_TRISTATE_SWITCH_OFF;
+}
+
+
 #ifndef WIN32
 
 int virSetInherit(int fd, bool inherit)

diff --git a/src/util/virutil.h b/src/util/virutil.h
index 49382557f6d6292c8bda5087b8c096bd0f246dd3..a862a8a637e1f379fd4ce09967c2a8b7e0367996 100644 (file)
--- a/src/util/virutil.h
+++ b/src/util/virutil.h
@@ -193,6 +193,9 @@ typedef enum {
 VIR_ENUM_DECL(virTristateBool)
 VIR_ENUM_DECL(virTristateSwitch)
 
+virTristateBool virTristateBoolFromBool(bool val);
+virTristateSwitch virTristateSwitchFromBool(bool val);
+
 /* the two enums must be in sync to be able to use helpers interchangeably in
  * some special cases */
 verify((int)VIR_TRISTATE_BOOL_YES == (int)VIR_TRISTATE_SWITCH_ON);