From nobody Mon May 6 02:59:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1572873917; cv=none; d=zoho.com; s=zohoarc; b=aMQjuuh3CGXxqJi2vyori5ldwmHWhmNc+ZR1wbadkWWEAcKmVZ/t4PuPDkCJt6JKIqKtlzNfuUc9kOvgPV0Ce1fSzI+UebXGBKp9yIqpbuYW8/tAbMKD+TbSdZDNEwiZdSOGpvE3iuQPwfSpRH1CHhXUyKkMZ0pKeVEhwjpgWlw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572873917; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=DX2BcGW36C9kSVzmKPxMsFUKeG2pREsntKAo6p/akBA=; b=MG/FvDXe96+53Vy9SK0KTbOr1jemILdH8IRuLnjLqqZDul/QHSqsgvuRyufpuegsFcVgU0aMCGAti6L31qODQCPS0quyBUqFlSlIYw/3DQDYrIs2zzXsPM6B9S6df2vvtSQ+r1yrC/cfRD5WCZVQXa5e1tH2jUMscB4KCE3eAR0= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1572873917325420.2531075873774; Mon, 4 Nov 2019 05:25:17 -0800 (PST) Received: from localhost ([::1]:32844 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iRcM5-0005Fc-FA for importer@patchew.org; Mon, 04 Nov 2019 08:25:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50670) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iRcL6-0004CW-ON for qemu-devel@nongnu.org; Mon, 04 Nov 2019 08:24:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iRcL5-00086k-Bt for qemu-devel@nongnu.org; Mon, 04 Nov 2019 08:24:12 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:56846) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iRcL5-00083W-3Q for qemu-devel@nongnu.org; Mon, 04 Nov 2019 08:24:11 -0500 Received: from pps.filterd (m0098404.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id xA4D9skv031110 for ; Mon, 4 Nov 2019 08:24:02 -0500 Received: from e06smtp03.uk.ibm.com (e06smtp03.uk.ibm.com [195.75.94.99]) by mx0a-001b2d01.pphosted.com with ESMTP id 2w2j046jy4-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 04 Nov 2019 08:24:01 -0500 Received: from localhost by e06smtp03.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 4 Nov 2019 13:23:58 -0000 Received: from b06avi18878370.portsmouth.uk.ibm.com (9.149.26.194) by e06smtp03.uk.ibm.com (192.168.101.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Mon, 4 Nov 2019 13:23:57 -0000 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06avi18878370.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id xA4DNuxb44695844 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 4 Nov 2019 13:23:56 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 576BE4C04A; Mon, 4 Nov 2019 13:23:56 +0000 (GMT) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 24DDD4C044; Mon, 4 Nov 2019 13:23:56 +0000 (GMT) Received: from bahia.tlslab.ibm.com (unknown [9.101.4.41]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTP; Mon, 4 Nov 2019 13:23:56 +0000 (GMT) Subject: [PATCH] qom: Fix error message in object_class_property_add() From: Greg Kurz To: Paolo Bonzini Date: Mon, 04 Nov 2019 14:23:55 +0100 User-Agent: StGit/unknown-version MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 x-cbid: 19110413-0012-0000-0000-000003608B12 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19110413-0013-0000-0000-0000219BE006 Message-Id: <157287383591.234942.311840593519058490.stgit@bahia.tlslab.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-11-04_08:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1034 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1908290000 definitions=main-1911040130 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.156.1 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: qemu-trivial@nongnu.org, "Daniel P. Berrange" , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" 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 --- 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, co= nst char *type, } =20 if (object_property_find(obj, name, NULL) !=3D 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; } =20 @@ -1139,9 +1138,8 @@ object_class_property_add(ObjectClass *klass, ObjectProperty *prop; =20 if (object_class_property_find(klass, name, NULL) !=3D 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; } =20