From: Laurent Vivier <laurent@vivier.eu>
To: Greg Kurz <groug@kaod.org>, Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-trivial@nongnu.org,
"Daniel P. Berrange" <berrange@redhat.com>,
qemu-devel@nongnu.org
Subject: Re: [PATCH] qom: Fix error message in object_class_property_add()
Date: Tue, 12 Nov 2019 10:33:37 +0100 [thread overview]
Message-ID: <d54b8758-a972-a5d0-3030-cd4d200f688b@vivier.eu> (raw)
In-Reply-To: <4edf8200-ec7a-65f7-844c-63735ac67b54@vivier.eu>
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
prev parent reply other threads:[~2019-11-12 9:36 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-04 13:23 [PATCH] qom: Fix error message in object_class_property_add() Greg Kurz
2019-11-04 14:06 ` Laurent Vivier
2019-11-05 14:05 ` Laurent Vivier
2019-11-12 9:33 ` Laurent Vivier [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d54b8758-a972-a5d0-3030-cd4d200f688b@vivier.eu \
--to=laurent@vivier.eu \
--cc=berrange@redhat.com \
--cc=groug@kaod.org \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).