From patchwork Tue Nov 12 10:04:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 11238981 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 35D4015AB for ; Tue, 12 Nov 2019 10:08:09 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 162A821783 for ; Tue, 12 Nov 2019 10:08:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 162A821783 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:32826 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iUT5k-0006HI-5j for patchwork-qemu-devel@patchwork.kernel.org; Tue, 12 Nov 2019 05:08:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53170) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iUT2h-00028d-RZ for qemu-devel@nongnu.org; Tue, 12 Nov 2019 05:05:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iUT2c-0002OU-TL for qemu-devel@nongnu.org; Tue, 12 Nov 2019 05:04:59 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:43395) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iUT2T-0002JA-VE; Tue, 12 Nov 2019 05:04:47 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MxVbb-1hg6Kw39aL-00xuCv; Tue, 12 Nov 2019 11:04:35 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 2/5] qom: Fix error message in object_class_property_add() Date: Tue, 12 Nov 2019 11:04:26 +0100 Message-Id: <20191112100429.11957-3-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191112100429.11957-1-laurent@vivier.eu> References: <20191112100429.11957-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:hX1f7s63XHJxMWSr5PchMTIHafeabkAwtI4hoBiSZ5QXMyKtAer X2UKJqRWIo6NXVLXwz/h8uweUuWlWu33WSp1rUDSFn8ijibTl0lFCnAfCJs8N8tqSpJ8eWy NkEb0TWaz8ATXYNLm+D11KKn7PJRmcETbyNpN6It4xJC3xDA/fQ+cWbW81CBLRQJhixS+K8 g532jwT1jCvo+odXhVbWA== X-UI-Out-Filterresults: notjunk:1;V03:K0:64ac703U+FM=:2YlQaI0vSx53LtyOdP59kL haq7UVuVseDBBO36Rqv3mqiLyV31y/5VWewA0z++vBGRD80XYYnrbr+vL8zyHxGr122NmjvQf hDDTLf/e6SO6ylLUSdGw8ngkjvVVFpi1123DltrTc0MpNojfECNz0V7DXf2U/OB+tyWPPEM2g WbIBUQH1YQTC1ruOnDgzDmitqn8/ut+LmU1bCf+6a3B+GiqgfdQY4JuotcvDduTGceF5KSUfC l2sfSKQhmptvZXcPOLl4tEXd66yVvRaZ9BjFkzqvkGfT5vkUhIGQTEPXMT2zE/xERwZoYtY5u 4pd+Epox79AxTqDprTcwpM4b2IksOjfGBjGj5T3fZ8tdapWAeO03VCFY0UpGyLQtdCqKV9upe JRbcCU3ef7kfHjTuvnSuN11GOCmy4xjca09rKc8ywXwRgAVgW8K4WsxMmEYsci15EFXPg2awG vnoLppBo7PyehOnGR47IVgzZ6lgc1dE/UUfpUPzkPJLcdrytotr/fY/4RGPtyB3DK42Kpzamu 5RoAY28vUmryHjxsJvNoJvXjiGj9MWafqwqSsqQxjT0HerDUq7CJSTmR+T7Fdp190Fk65rz4u zXLiREeQB8tQPtwUahMAeVf2Ee95zHFQgQ/MmAbexBdcGsth+UlucbwRBZUHVS+kafV+79l1J uBZLkdUBSlPQBUNC2q88fnzKe77Yv3xJ111rpLd1iCjEs2ojLd9jbNeeyNcqQPFXdKPTT+zNL G3P5jGdiLOlOK6mhcA9RTAzcD4jy3v3B2T77BGNic50fMPYKHV/sBpcdp0NNNRl3nZSWVD1v2 tFkv3NHJJml6ZcD3LxxmWYWcXsC1cCwp6FSKm72+H4PKgmiCzzTtIlNrREdV/oagzWF5ZMUTA OrtNXN6vxRmu3/ob1uNQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.24 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , qemu-trivial@nongnu.org, Michael Tokarev , Laurent Vivier , Greg Kurz , Paolo Bonzini Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Greg Kurz 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 Reviewed-by: Laurent Vivier Message-Id: <157287383591.234942.311840593519058490.stgit@bahia.tlslab.ibm.com> Signed-off-by: Laurent Vivier --- 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; }