1. Patchew
  2. QEMU
  3. View series

[PATCH] qom: Fix error message in object_class_property_add()

Greg Kurz posted 1 patch 4 years, 5 months ago
Test asan passed
Test checkpatch passed
Test FreeBSD passed
Test docker-mingw@fedora passed
Test docker-clang@ubuntu passed
Test docker-quick@centos7 passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/157287383591.234942.311840593519058490.stgit@bahia.tlslab.ibm.com
Maintainers: Paolo Bonzini <pbonzini@redhat.com>, Eduardo Habkost <ehabkost@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>
qom/object.c |   10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
[PATCH] qom: Fix error message in object_class_property_add()
Posted by Greg Kurz 4 years, 5 months ago 
The error message in object_class_property_add() was copied from
object_property_add() in commit 16bf7f522a2ff. Clarify that it is
about a class, not an object.

While here, have the format string in both functions to fit in a
single line for better grep-ability, despite the checkpatch warning.

Signed-off-by: Greg Kurz <groug@kaod.org>
---
 qom/object.c |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/qom/object.c b/qom/object.c
index 6fa9c619fac4..d51b57fba11e 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -1106,9 +1106,8 @@ object_property_add(Object *obj, const char *name, const char *type,
     }
 
     if (object_property_find(obj, name, NULL) != NULL) {
-        error_setg(errp, "attempt to add duplicate property '%s'"
-                   " to object (type '%s')", name,
-                   object_get_typename(obj));
+        error_setg(errp, "attempt to add duplicate property '%s' to object (type '%s')",
+                   name, object_get_typename(obj));
         return NULL;
     }
 
@@ -1139,9 +1138,8 @@ object_class_property_add(ObjectClass *klass,
     ObjectProperty *prop;
 
     if (object_class_property_find(klass, name, NULL) != NULL) {
-        error_setg(errp, "attempt to add duplicate property '%s'"
-                   " to object (type '%s')", name,
-                   object_class_get_name(klass));
+        error_setg(errp, "attempt to add duplicate property '%s' to class (type '%s')",
+                   name, object_class_get_name(klass));
         return NULL;
     }
Re: [PATCH] qom: Fix error message in object_class_property_add()
Posted by Laurent Vivier 4 years, 5 months ago 
Le 04/11/2019 à 14:23, Greg Kurz a écrit :
> The error message in object_class_property_add() was copied from
> object_property_add() in commit 16bf7f522a2ff. Clarify that it is
> about a class, not an object.
> 
> While here, have the format string in both functions to fit in a
> single line for better grep-ability, despite the checkpatch warning.
> 
> Signed-off-by: Greg Kurz <groug@kaod.org>
> ---
>  qom/object.c |   10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/qom/object.c b/qom/object.c
> index 6fa9c619fac4..d51b57fba11e 100644
> --- a/qom/object.c
> +++ b/qom/object.c
> @@ -1106,9 +1106,8 @@ object_property_add(Object *obj, const char *name, const char *type,
>      }
>  
>      if (object_property_find(obj, name, NULL) != NULL) {
> -        error_setg(errp, "attempt to add duplicate property '%s'"
> -                   " to object (type '%s')", name,
> -                   object_get_typename(obj));
> +        error_setg(errp, "attempt to add duplicate property '%s' to object (type '%s')",
> +                   name, object_get_typename(obj));
>          return NULL;
>      }
>  
> @@ -1139,9 +1138,8 @@ object_class_property_add(ObjectClass *klass,
>      ObjectProperty *prop;
>  
>      if (object_class_property_find(klass, name, NULL) != NULL) {
> -        error_setg(errp, "attempt to add duplicate property '%s'"
> -                   " to object (type '%s')", name,
> -                   object_class_get_name(klass));
> +        error_setg(errp, "attempt to add duplicate property '%s' to class (type '%s')",
> +                   name, object_class_get_name(klass));
>          return NULL;
>      }
>  
> 
> 

Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Re: [PATCH] qom: Fix error message in object_class_property_add()
Posted by Laurent Vivier 4 years, 5 months ago 
Le 04/11/2019 à 14:23, Greg Kurz a écrit :
> The error message in object_class_property_add() was copied from
> object_property_add() in commit 16bf7f522a2ff. Clarify that it is
> about a class, not an object.
> 
> While here, have the format string in both functions to fit in a
> single line for better grep-ability, despite the checkpatch warning.
> 
> Signed-off-by: Greg Kurz <groug@kaod.org>
> ---
>  qom/object.c |   10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/qom/object.c b/qom/object.c
> index 6fa9c619fac4..d51b57fba11e 100644
> --- a/qom/object.c
> +++ b/qom/object.c
> @@ -1106,9 +1106,8 @@ object_property_add(Object *obj, const char *name, const char *type,
>      }
>  
>      if (object_property_find(obj, name, NULL) != NULL) {
> -        error_setg(errp, "attempt to add duplicate property '%s'"
> -                   " to object (type '%s')", name,
> -                   object_get_typename(obj));
> +        error_setg(errp, "attempt to add duplicate property '%s' to object (type '%s')",
> +                   name, object_get_typename(obj));
>          return NULL;
>      }
>  
> @@ -1139,9 +1138,8 @@ object_class_property_add(ObjectClass *klass,
>      ObjectProperty *prop;
>  
>      if (object_class_property_find(klass, name, NULL) != NULL) {
> -        error_setg(errp, "attempt to add duplicate property '%s'"
> -                   " to object (type '%s')", name,
> -                   object_class_get_name(klass));
> +        error_setg(errp, "attempt to add duplicate property '%s' to class (type '%s')",
> +                   name, object_class_get_name(klass));
>          return NULL;
>      }
>  
> 
> 

Applied to my trivial-patches branch.

Thanks,
Laurent
Re: [PATCH] qom: Fix error message in object_class_property_add()
Posted by Laurent Vivier 4 years, 5 months ago 
Le 05/11/2019 à 15:05, Laurent Vivier a écrit :
> Le 04/11/2019 à 14:23, Greg Kurz a écrit :
>> The error message in object_class_property_add() was copied from
>> object_property_add() in commit 16bf7f522a2ff. Clarify that it is
>> about a class, not an object.
>>
>> While here, have the format string in both functions to fit in a
>> single line for better grep-ability, despite the checkpatch warning.
>>
>> Signed-off-by: Greg Kurz <groug@kaod.org>
>> ---
>>  qom/object.c |   10 ++++------
>>  1 file changed, 4 insertions(+), 6 deletions(-)
>>
>> diff --git a/qom/object.c b/qom/object.c
>> index 6fa9c619fac4..d51b57fba11e 100644
>> --- a/qom/object.c
>> +++ b/qom/object.c
>> @@ -1106,9 +1106,8 @@ object_property_add(Object *obj, const char *name, const char *type,
>>      }
>>  
>>      if (object_property_find(obj, name, NULL) != NULL) {
>> -        error_setg(errp, "attempt to add duplicate property '%s'"
>> -                   " to object (type '%s')", name,
>> -                   object_get_typename(obj));
>> +        error_setg(errp, "attempt to add duplicate property '%s' to object (type '%s')",
>> +                   name, object_get_typename(obj));
>>          return NULL;
>>      }
>>  
>> @@ -1139,9 +1138,8 @@ object_class_property_add(ObjectClass *klass,
>>      ObjectProperty *prop;
>>  
>>      if (object_class_property_find(klass, name, NULL) != NULL) {
>> -        error_setg(errp, "attempt to add duplicate property '%s'"
>> -                   " to object (type '%s')", name,
>> -                   object_class_get_name(klass));
>> +        error_setg(errp, "attempt to add duplicate property '%s' to class (type '%s')",
>> +                   name, object_class_get_name(klass));
>>          return NULL;
>>      }
>>  
>>
>>
> 
> Applied to my trivial-patches branch.
> 
> Thanks,
> Laurent
> 

Applied to my trivial-patches branch again.

Thanks,
Laurent

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.