[PATCH 1/3] virhostcpu.c: modernize virHostCPUGetMicrocodeVersion()

Daniel Henrique Barboza danielhb413 at gmail.com
Mon Aug 24 13:27:52 UTC 2020


Use g_autofree and remove the cleanup label.

Signed-off-by: Daniel Henrique Barboza <danielhb413 at gmail.com>
---
 src/util/virhostcpu.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c
index 6cea75536d..d7aa39c131 100644
--- a/src/util/virhostcpu.c
+++ b/src/util/virhostcpu.c
@@ -1241,7 +1241,7 @@ virHostCPUGetKVMMaxVCPUs(void)
 unsigned int
 virHostCPUGetMicrocodeVersion(void)
 {
-    char *outbuf = NULL;
+    g_autofree char *outbuf = NULL;
     char *cur;
     unsigned int version = 0;
 
@@ -1254,16 +1254,14 @@ virHostCPUGetMicrocodeVersion(void)
     /* Account for format 'microcode    : XXXX'*/
     if (!(cur = strstr(outbuf, "microcode")) ||
         !(cur = strchr(cur, ':')))
-        goto cleanup;
+        return 0;
     cur++;
 
     /* Linux places the microcode revision in a 32-bit integer, so
      * ui is fine for us too.  */
     if (virStrToLong_ui(cur, &cur, 0, &version) < 0)
-        goto cleanup;
+        return 0;
 
- cleanup:
-    VIR_FREE(outbuf);
     return version;
 }
 
-- 
2.26.2




More information about the libvir-list mailing list