Error messages change from
Property 'TYPE-NAME.PROP-NAME' doesn't take value '0'
or similar to
cannot set property 'PROP-NAME' of 'TYPE-NAME' to zero
One of them is guarded by unsigned value <= 0. Use !value instead for
clarity.
Suggested-by: Daniel P. Berrangé <[email protected]>
Signed-off-by: Markus Armbruster <[email protected]>
---
backends/cryptodev.c | 4 ++--
backends/hostmem-memfd.c | 4 ++--
backends/hostmem.c | 11 +++++------
net/dump.c | 4 ++--
4 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/backends/cryptodev.c b/backends/cryptodev.c
index 46059faa26c..585cc90890f 100644
--- a/backends/cryptodev.c
+++ b/backends/cryptodev.c
@@ -311,8 +311,8 @@ cryptodev_backend_set_queues(Object *obj, Visitor *v, const
char *name,
return;
}
if (!value) {
- error_setg(errp, "Property '%s.%s' doesn't take value '%" PRIu32 "'",
- object_get_typename(obj), name, value);
+ error_setg(errp, "cannot set property '%s' of '%s' to zero",
+ name, object_get_typename(obj));
return;
}
backend->conf.peers.queues = value;
diff --git a/backends/hostmem-memfd.c b/backends/hostmem-memfd.c
index 46489212a23..0f5ab896192 100644
--- a/backends/hostmem-memfd.c
+++ b/backends/hostmem-memfd.c
@@ -143,8 +143,8 @@ memfd_backend_set_hugetlbsize(Object *obj, Visitor *v,
const char *name,
return;
}
if (!value) {
- error_setg(errp, "Property '%s.%s' doesn't take value '%" PRIu64 "'",
- object_get_typename(obj), name, value);
+ error_setg(errp, "cannot set property '%s' of '%s' to zero",
+ name, object_get_typename(obj));
return;
}
m->hugetlbsize = value;
diff --git a/backends/hostmem.c b/backends/hostmem.c
index 173d042be35..9e7450c67b7 100644
--- a/backends/hostmem.c
+++ b/backends/hostmem.c
@@ -76,9 +76,8 @@ host_memory_backend_set_size(Object *obj, Visitor *v, const
char *name,
return;
}
if (!value) {
- error_setg(errp,
- "property '%s' of %s doesn't take value '%" PRIu64 "'",
- name, object_get_typename(obj), value);
+ error_setg(errp, "cannot set property '%s' of '%s' to zero",
+ name, object_get_typename(obj));
return;
}
backend->size = value;
@@ -275,9 +274,9 @@ static void host_memory_backend_set_prealloc_threads(Object
*obj, Visitor *v,
if (!visit_type_uint32(v, name, &value, errp)) {
return;
}
- if (value <= 0) {
- error_setg(errp, "property '%s' of %s doesn't take value '%d'", name,
- object_get_typename(obj), value);
+ if (!value) {
+ error_setg(errp, "cannot set property '%s' of '%s' to zero",
+ name, object_get_typename(obj));
return;
}
backend->prealloc_threads = value;
diff --git a/net/dump.c b/net/dump.c
index da366f48da7..52d94f101e6 100644
--- a/net/dump.c
+++ b/net/dump.c
@@ -199,8 +199,8 @@ static void filter_dump_set_maxlen(Object *obj, Visitor *v,
const char *name,
return;
}
if (value == 0) {
- error_setg(errp, "Property '%s.%s' doesn't take value '%u'",
- object_get_typename(obj), name, value);
+ error_setg(errp, "cannot set property '%s' of '%s' to zero",
+ name, object_get_typename(obj));
return;
}
nfds->maxlen = value;
--
2.55.0