From patchwork Fri Oct 30 20:21:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 1391307 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=E1mUB7hZ; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4CNDRZ5Vk8z9sSG for ; Sat, 31 Oct 2020 07:28:58 +1100 (AEDT) Received: from localhost ([::1]:37870 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kYb16-0002Fe-M4 for incoming@patchwork.ozlabs.org; Fri, 30 Oct 2020 16:28:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53264) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kYauk-0001GW-6T for qemu-devel@nongnu.org; Fri, 30 Oct 2020 16:22:22 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:37212) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kYaui-0007mZ-EU for qemu-devel@nongnu.org; Fri, 30 Oct 2020 16:22:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604089339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7QuXmq31Vq2e3TqZloS577E4vGvGcTIHAHZaf5VG7KY=; b=E1mUB7hZ+xtGheNH0pRwh72GaiYq52gM07pImnvbZU3rtDeBzgesyTKOqvJ0QmysE5CLQR oHkpmqf9bJ7gqcBDZJA+d14IbhUMQy07F6nbFjoualJ1Dufxu4sm2IES+MH0CW8cOm6MNE sD9RaP+vTgh8It4cAVR21EguvJNLk2s= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-105-DXlY5l8LMiCZmj08StgpCw-1; Fri, 30 Oct 2020 16:22:17 -0400 X-MC-Unique: DXlY5l8LMiCZmj08StgpCw-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F0FF8107AFDD for ; Fri, 30 Oct 2020 20:22:16 +0000 (UTC) Received: from localhost (ovpn-114-68.rdu2.redhat.com [10.10.114.68]) by smtp.corp.redhat.com (Postfix) with ESMTP id 86B8319D61; Fri, 30 Oct 2020 20:22:16 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 20/20] qom: Remove error prefix check at object_property_parse() Date: Fri, 30 Oct 2020 16:21:31 -0400 Message-Id: <20201030202131.796967-21-ehabkost@redhat.com> In-Reply-To: <20201030202131.796967-1-ehabkost@redhat.com> References: <20201030202131.796967-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/30 16:21:37 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Markus Armbruster Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" All existing "Property '.' ..." error messages were rewritten, we can now add the error message prefix unconditionally. Signed-off-by: Eduardo Habkost --- Cc: Paolo Bonzini Cc: "Daniel P. Berrangé" Cc: Eduardo Habkost Cc: qemu-devel@nongnu.org --- qom/object.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/qom/object.c b/qom/object.c index 6fb1657724..4fc536716c 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1640,14 +1640,8 @@ bool object_property_parse(Object *obj, const char *name, bool ok = object_property_set(obj, name, v, errp); if (!ok) { - /* - * Temporary check for existing prefix, until all error reporting - * functions remove their own prefix. - */ - if (!g_str_has_prefix(error_get_pretty(*errp), "Property '")) { - error_prepend(errp, "Property '%s.%s' can't take value '%s': ", - object_get_typename(obj), name, string); - } + error_prepend(errp, "Property '%s.%s' can't take value '%s': ", + object_get_typename(obj), name, string); } visit_free(v); return ok;