From: Ján Tomko <jtomko@redhat.com> Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/hyperv/hyperv_driver.c | 6 ++---- src/hyperv/hyperv_wmi.c | 9 ++------- src/hyperv/hyperv_wmi.h | 4 ++-- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index 68b2e7fa67..940fa58d0d 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -3739,8 +3739,7 @@ hypervDomainSendKey(virDomainPtr domain, unsigned int codeset, if (!params) return -1; - if (hypervAddSimpleParam(params, "keyCode", keycodeStr) < 0) - return -1; + hypervAddSimpleParam(params, "keyCode", keycodeStr); if (hypervInvokeMethod(priv, ¶ms, NULL) < 0) return -1; @@ -3759,8 +3758,7 @@ hypervDomainSendKey(virDomainPtr domain, unsigned int codeset, if (!params) return -1; - if (hypervAddSimpleParam(params, "keyCode", keycodeStr) < 0) - return -1; + hypervAddSimpleParam(params, "keyCode", keycodeStr); if (hypervInvokeMethod(priv, ¶ms, NULL) < 0) return -1; diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c index 1e39e6d61f..ab3eb5ffc0 100644 --- a/src/hyperv/hyperv_wmi.c +++ b/src/hyperv/hyperv_wmi.c @@ -204,10 +204,8 @@ hypervCheckParams(hypervInvokeParamsList *params) * * Add a param of type HYPERV_SIMPLE_PARAM, which is essentially a serialized * key/value pair. - * - * Returns -1 on failure, 0 on success. */ -int +void hypervAddSimpleParam(hypervInvokeParamsList *params, const char *name, const char *value) { @@ -222,8 +220,6 @@ hypervAddSimpleParam(hypervInvokeParamsList *params, const char *name, p->simple.value = value; params->nbParams++; - - return 0; } @@ -1672,8 +1668,7 @@ hypervImageManagementServiceGetVHDSD(hypervPrivate *priv, params = hypervCreateInvokeParamsList("GetVirtualHardDiskSettingData", MSVM_IMAGEMANAGEMENTSERVICE_SELECTOR, Msvm_ImageManagementService_WmiInfo); - if (hypervAddSimpleParam(params, "Path", vhdPath) < 0) - return -1; + hypervAddSimpleParam(params, "Path", vhdPath); if (hypervInvokeMethod(priv, ¶ms, &response) < 0) return -1; diff --git a/src/hyperv/hyperv_wmi.h b/src/hyperv/hyperv_wmi.h index 36ca85a592..706fd85e87 100644 --- a/src/hyperv/hyperv_wmi.h +++ b/src/hyperv/hyperv_wmi.h @@ -141,8 +141,8 @@ hypervInvokeParamsList *hypervCreateInvokeParamsList(const char *method, void hypervFreeInvokeParams(hypervInvokeParamsList *params); G_DEFINE_AUTOPTR_CLEANUP_FUNC(hypervInvokeParamsList, hypervFreeInvokeParams); -int hypervAddSimpleParam(hypervInvokeParamsList *params, const char *name, - const char *value); +void hypervAddSimpleParam(hypervInvokeParamsList *params, const char *name, + const char *value); int hypervAddEprParam(hypervInvokeParamsList *params, const char *name, -- 2.54.0