From: Eero Tamminen <eero.t.tamminen@intel.com>
Date: Fri, 10 Mar 2023 14:12:37 +0000 (+0200)
Subject: gpu_sysman: log correct power limit error value
X-Git-Tag: 6.0.0-rc0~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85af5456870613937ffb355a012a528e4edb95cb;p=thirdparty%2Fcollectd.git

gpu_sysman: log correct power limit error value

Fixes: 55a9296a0ec1b

Signed-off-by: Eero Tamminen <eero.t.tamminen@intel.com>
---

diff --git a/src/gpu_sysman.c b/src/gpu_sysman.c
index f95ed0a08..7df99ff7f 100644
--- a/src/gpu_sysman.c
+++ b/src/gpu_sysman.c
@@ -2060,6 +2060,7 @@ static bool gpu_powers(gpu_device_t *gpu) {
   };
   metric_t metric = {0};
 
+  ze_result_t limit_ret = ZE_RESULT_SUCCESS;
   bool reported_ratio = false, reported_power = false, reported_energy = false;
   bool ratio_fail = false;
   bool ok = false;
@@ -2109,8 +2110,8 @@ static bool gpu_powers(gpu_device_t *gpu) {
          * Switch to querying list of limits after Sysman plugin starts
          * requiring that spec version / loader.
          */
-        if (ret = zesPowerGetLimits(powers[i], &sustain, &burst, NULL),
-            ret == ZE_RESULT_SUCCESS) {
+        if (limit_ret = zesPowerGetLimits(powers[i], &sustain, &burst, NULL),
+            limit_ret == ZE_RESULT_SUCCESS) {
           const char *name;
           int32_t limit = 0;
           /* Multiply by 1000, as sustain interval is in ms & power in mJ/s,
@@ -2155,7 +2156,7 @@ static bool gpu_powers(gpu_device_t *gpu) {
     if (ok) {
       WARNING(PLUGIN_NAME ": failed to get power limit(s) "
                           "for any of the %d domain(s), last error = 0x%x",
-              power_count, ret);
+              power_count, limit_ret);
     }
   }
   free(powers);