From: Matt Coleman <mcoleman@datto.com>
Date: Thu, 22 Oct 2020 16:38:24 +0000 (-0400)
Subject: hyperv: do not overwrite errors from hypervInvokeMethod()
X-Git-Tag: v6.10.0-rc1~400
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1a06feed7e12fcb29709853780da6e37cf2a788;p=thirdparty%2Flibvirt.git

hyperv: do not overwrite errors from hypervInvokeMethod()

Signed-off-by: Matt Coleman <matt@datto.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c
index fba1e355db..a71d0d6261 100644
--- a/src/hyperv/hyperv_driver.c
+++ b/src/hyperv/hyperv_driver.c
@@ -1800,11 +1800,8 @@ hypervDomainSendKey(virDomainPtr domain, unsigned int codeset,
         if (hypervAddSimpleParam(params, "keyCode", keycodeStr) < 0)
             goto cleanup;
 
-        if (hypervInvokeMethod(priv, &params, NULL) < 0) {
-            virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not press key %d"),
-                           translatedKeycodes[i]);
+        if (hypervInvokeMethod(priv, &params, NULL) < 0)
             goto cleanup;
-        }
     }
 
     /* simulate holdtime by sleeping */
@@ -1823,11 +1820,8 @@ hypervDomainSendKey(virDomainPtr domain, unsigned int codeset,
         if (hypervAddSimpleParam(params, "keyCode", keycodeStr) < 0)
             goto cleanup;
 
-        if (hypervInvokeMethod(priv, &params, NULL) < 0) {
-            virReportError(VIR_ERR_INTERNAL_ERROR,
-                           _("Could not release key %s"), keycodeStr);
+        if (hypervInvokeMethod(priv, &params, NULL) < 0)
             goto cleanup;
-        }
     }
 
     result = 0;
@@ -1919,10 +1913,8 @@ hypervDomainSetMemoryFlags(virDomainPtr domain, unsigned long memory,
         }
     }
 
-    if (hypervInvokeMethod(priv, &params, NULL) < 0) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not set memory"));
+    if (hypervInvokeMethod(priv, &params, NULL) < 0)
         goto cleanup;
-    }
 
     result = 0;