virDomainDeviceLoadparmIsValid: Simplify value lenght check

Use the new STRLIM macro and unify it with the empty string check.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 1905f20d9e117234940c096750af2432109485a8..6f8edf7694c583f976a5abc99e8c13368ffb6567 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -6300,15 +6300,10 @@ virDomainDeviceLoadparmIsValid(const char *loadparm)
 {
     size_t i;
 
-    if (virStringIsEmpty(loadparm)) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                       _("loadparm cannot be an empty string"));
-        return false;
-    }
-
-    if (strlen(loadparm) > 8) {
+    if (virStringIsEmpty(loadparm) || !STRLIM(loadparm, 8)) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
-                       _("loadparm '%s' exceeds 8 characters"), loadparm);
+                       _("loadparm value '%s' must be between 1 and 8 characters"),
+                       loadparm);
         return false;
     }
 

diff --git a/tests/qemuxml2argvdata/machine-loadparm-s390-len-invalid.err b/tests/qemuxml2argvdata/machine-loadparm-s390-len-invalid.err
index 9afaa68ae23be003927754a1f488f3579f0958fa..9fd0425f20543c0bf65fdf3ffe4bcf6d4cecb920 100644 (file)
--- a/tests/qemuxml2argvdata/machine-loadparm-s390-len-invalid.err
+++ b/tests/qemuxml2argvdata/machine-loadparm-s390-len-invalid.err
@@ -1 +1 @@
-internal error: loadparm 'LOADPARM1' exceeds 8 characters
+internal error: loadparm value 'LOADPARM1' must be between 1 and 8 characters