[libvirt PATCH 2/3] hyperv: return void from hypervAddEprParam

[Ján Tomko via Devel]

From: Ján Tomko <jto...@redhat.com>

Signed-off-by: Ján Tomko <jto...@redhat.com>
---
 src/hyperv/hyperv_driver.c | 13 +++++--------
 src/hyperv/hyperv_wmi.c    | 11 ++++-------
 src/hyperv/hyperv_wmi.h    |  8 ++++----
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c
index 940fa58d0d..52e2ac111c 100644
--- a/src/hyperv/hyperv_driver.c
+++ b/src/hyperv/hyperv_driver.c
@@ -2968,8 +2968,7 @@ hypervDomainUndefineFlags(virDomainPtr domain, unsigned 
int flags)
 
     virBufferEscapeSQL(&eprQuery, MSVM_COMPUTERSYSTEM_WQL_SELECT "WHERE Name = 
'%s'", uuid_string);
 
-    if (hypervAddEprParam(params, "AffectedSystem", &eprQuery, 
Msvm_ComputerSystem_WmiInfo) < 0)
-        return -1;
+    hypervAddEprParam(params, "AffectedSystem", &eprQuery, 
Msvm_ComputerSystem_WmiInfo);
 
     /* actually destroy the VM */
     if (hypervInvokeMethod(priv, &params, NULL) < 0)
@@ -4238,9 +4237,8 @@ hypervDomainSnapshotCreateXML(virDomainPtr domain,
     if (!params)
         return NULL;
 
-    if (hypervAddEprParam(params, "AffectedSystem", &eprQuery,
-                          Msvm_ComputerSystem_WmiInfo) < 0)
-        return NULL;
+    hypervAddEprParam(params, "AffectedSystem", &eprQuery,
+                      Msvm_ComputerSystem_WmiInfo);
 
     snapshotSettings = 
hypervCreateEmbeddedParam(Msvm_VirtualSystemSnapshotSettingData_WmiInfo);
     if (!snapshotSettings)
@@ -4304,9 +4302,8 @@ hypervDomainSnapshotDelete(virDomainSnapshotPtr snapshot,
     if (!params)
         return -1;
 
-    if (hypervAddEprParam(params, "AffectedSnapshot", &eprQuery,
-                          Msvm_VirtualSystemSettingData_WmiInfo) < 0)
-        return -1;
+    hypervAddEprParam(params, "AffectedSnapshot", &eprQuery,
+                      Msvm_VirtualSystemSettingData_WmiInfo);
 
     /* Invoke the method */
     if (hypervInvokeMethod(priv, &params, NULL) < 0)
diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c
index ab3eb5ffc0..30ff81d83e 100644
--- a/src/hyperv/hyperv_wmi.c
+++ b/src/hyperv/hyperv_wmi.c
@@ -231,9 +231,9 @@ hypervAddSimpleParam(hypervInvokeParamsList *params, const 
char *name,
  * @query: WQL filter
  * @eprInfo: WmiInfo of the object being filtered
  *
- * Adds an EPR param to the params list. Returns -1 on failure, 0 on success.
+ * Adds an EPR param to the params list.
  */
-int
+void
 hypervAddEprParam(hypervInvokeParamsList *params,
                   const char *name,
                   virBuffer *query,
@@ -249,8 +249,6 @@ hypervAddEprParam(hypervInvokeParamsList *params,
     p->epr.query = query;
     p->epr.info = classInfo;
     params->nbParams++;
-
-    return 0;
 }
 
 
@@ -1730,9 +1728,8 @@ hypervMsvmVSMSAddResourceSettings(virDomainPtr domain,
     if (!params)
         return -1;
 
-    if (hypervAddEprParam(params, "AffectedConfiguration",
-                          &eprQuery, Msvm_VirtualSystemSettingData_WmiInfo) < 
0)
-        return -1;
+    hypervAddEprParam(params, "AffectedConfiguration",
+                      &eprQuery, Msvm_VirtualSystemSettingData_WmiInfo);
 
     if (hypervAddEmbeddedParam(params, "ResourceSettings", &resourceSettings, 
wmiInfo) < 0) {
         hypervFreeEmbeddedParam(resourceSettings);
diff --git a/src/hyperv/hyperv_wmi.h b/src/hyperv/hyperv_wmi.h
index 706fd85e87..c769ac4db0 100644
--- a/src/hyperv/hyperv_wmi.h
+++ b/src/hyperv/hyperv_wmi.h
@@ -144,10 +144,10 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(hypervInvokeParamsList, 
hypervFreeInvokeParams);
 void hypervAddSimpleParam(hypervInvokeParamsList *params, const char *name,
                           const char *value);
 
-int hypervAddEprParam(hypervInvokeParamsList *params,
-                      const char *name,
-                      virBuffer *query,
-                      hypervWmiClassInfo *eprInfo);
+void hypervAddEprParam(hypervInvokeParamsList *params,
+                       const char *name,
+                       virBuffer *query,
+                       hypervWmiClassInfo *eprInfo);
 
 GHashTable *hypervCreateEmbeddedParam(hypervWmiClassInfo *info);
 
-- 
2.54.0