[PATCH 13/31] virPCIVPDResourceGetKeywordPrefix: Fix logging

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Use VIR_DEBUG instead of VIR_INFO as that's more appropriate and report
relevant information for debugging.

Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
 src/util/virpcivpd.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/util/virpcivpd.c b/src/util/virpcivpd.c
index b303e161ae..67065dec46 100644
--- a/src/util/virpcivpd.c
+++ b/src/util/virpcivpd.c
@@ -61,20 +61,20 @@ virPCIVPDResourceGetKeywordPrefix(const char *keyword)
     g_autofree char *key = NULL;

     /* Keywords must have a length of 2 bytes. */
-    if (strlen(keyword) != 2) {
-        VIR_INFO("The keyword length is not 2 bytes: %s", keyword);
-        return NULL;
-    } else if (!(virPCIVPDResourceIsUpperOrNumber(keyword[0]) &&
-                 virPCIVPDResourceIsUpperOrNumber(keyword[1]))) {
-        VIR_INFO("The keyword is not comprised only of uppercase ASCII letters or digits");
-        return NULL;
-    }
+    if (strlen(keyword) != 2 ||
+        !(virPCIVPDResourceIsUpperOrNumber(keyword[0]) &&
+          virPCIVPDResourceIsUpperOrNumber(keyword[1])))
+        goto cleanup;
+
     /* Special-case the system-specific keywords since they share the "Y" prefix with "YA". */
     if (virPCIVPDResourceIsSystemKeyword(keyword) || virPCIVPDResourceIsVendorKeyword(keyword))
         key = g_strndup(keyword, 1);
     else
         key = g_strndup(keyword, 2);

+ cleanup:
+    VIR_DEBUG("keyword='%s' key='%s'", keyword, NULLSTR(key));
+
     return g_steal_pointer(&key);
 }

-- 
2.43.0
_______________________________________________
Devel mailing list -- devel@xxxxxxxxxxxxxxxxx
To unsubscribe send an email to devel-leave@xxxxxxxxxxxxxxxxx




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux