From nobody Sat May 4 02:59:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1600347474; cv=none; d=zohomail.com; s=zohoarc; b=LCfuGO+ifuqWYhWsYJyN71d04PClVWQzoAOlWB9/kIUxDMRLS/15VL2k0JbecSsVtL24e6myEUFjdNsX43BPiaD37YyQH8iKGYWpbk/JCJT06Ea4TPYJ1b8kCt9HS6ydGQWcgDJ+nlRo3NbKIL2BVjOVsbc7E7GoYcA5pLF6ojM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600347474; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=obmJ0KeESULi/hgxDtnBfOOj724RUrftZtPg5W4xKw4=; b=Mc/eCYQ0xHPG+NgkjP9PH2BIwi5u1QfBJEPJ0PhgvDobbL3b9VRaYY24yvYa7m49iHKxVA6ePpq6sP3leaAeiWQ72iTa9F5zalZJPH7N3kjzXk62ls075CNt9lyyj45IbrYyDGVhZ5TtlgazWk3fTeheprbmSEdgOaPAkVv4EnQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600347474598533.9865458799371; Thu, 17 Sep 2020 05:57:54 -0700 (PDT) Received: from localhost ([::1]:39644 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kItU1-0005Ou-FZ for importer@patchew.org; Thu, 17 Sep 2020 08:57:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44746) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kItSh-00046c-IX for qemu-devel@nongnu.org; Thu, 17 Sep 2020 08:56:31 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:54545) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kItSf-00088p-PX for qemu-devel@nongnu.org; Thu, 17 Sep 2020 08:56:31 -0400 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-263-UXnOU7PuMnCBa71688tj3Q-1; Thu, 17 Sep 2020 08:56:25 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5F0508DEA4F; Thu, 17 Sep 2020 12:55:43 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-114-66.ams2.redhat.com [10.36.114.66]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 06E567880F; Thu, 17 Sep 2020 12:55:43 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 7856611386A0; Thu, 17 Sep 2020 14:55:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600347388; 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=obmJ0KeESULi/hgxDtnBfOOj724RUrftZtPg5W4xKw4=; b=I1L8rF64h+t0UqBfU8gHz8GoFhK1VeKjr7AhCfnLBthyCZ6w/F5kpElAlzWfjIPuEv17al lqIpZExpEjwjnpRMkGe3p2rqHbXgbHT1qZPhWFP59OosEmcJScEcl3tDMEWobQLii7S0s3 sKTckCUNtRGgxH3nG1iL5fZm9eY67tc= X-MC-Unique: UXnOU7PuMnCBa71688tj3Q-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 1/2] qom: Clean up object_property_get_enum()'s error value Date: Thu, 17 Sep 2020 14:55:39 +0200 Message-Id: <20200917125540.597786-2-armbru@redhat.com> In-Reply-To: <20200917125540.597786-1-armbru@redhat.com> References: <20200917125540.597786-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=216.205.24.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/17 02:01:40 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.997, 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_H5=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: pbonzini@redhat.com, berrange@redhat.com, ehabkost@redhat.com, groug@kaod.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" object_property_get_enum() is the only object_property_FOO() that is documented to return an undefined value on error. It does no such thing, actually: it returns 0 on some errors, and -1 on others. Needlessly complicated. Always return -1 on error, and adjust the contract. Signed-off-by: Markus Armbruster Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Greg Kurz --- include/qom/object.h | 6 +++--- qom/object.c | 6 +++--- tests/check-qom-proplist.c | 2 ++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/include/qom/object.h b/include/qom/object.h index 056f67ab3b..f75547a3fe 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -1687,9 +1687,9 @@ uint64_t object_property_get_uint(Object *obj, const = char *name, * @typename: the name of the enum data type * @errp: returns an error if this function fails * - * Returns: the value of the property, converted to an integer, or - * undefined if an error occurs (including when the property value is not - * an enum). + * Returns: the value of the property, converted to an integer (which + * can't be negative), or -1 on error (including when the property + * value is not an enum). */ int object_property_get_enum(Object *obj, const char *name, const char *typename, Error **errp); diff --git a/qom/object.c b/qom/object.c index 387efb25eb..cecad35b99 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1564,21 +1564,21 @@ int object_property_get_enum(Object *obj, const cha= r *name, EnumProperty *enumprop; =20 if (prop =3D=3D NULL) { - return 0; + return -1; } =20 if (!g_str_equal(prop->type, typename)) { error_setg(errp, "Property %s on %s is not '%s' enum type", name, object_class_get_name( object_get_class(obj)), typename); - return 0; + return -1; } =20 enumprop =3D prop->opaque; =20 str =3D object_property_get_str(obj, name, errp); if (!str) { - return 0; + return -1; } =20 ret =3D qapi_enum_parse(enumprop->lookup, str, -1, errp); diff --git a/tests/check-qom-proplist.c b/tests/check-qom-proplist.c index 1571606c1c..1b76581980 100644 --- a/tests/check-qom-proplist.c +++ b/tests/check-qom-proplist.c @@ -491,6 +491,7 @@ static void test_dummy_getenum(void) "av", "BadAnimal", &err); + g_assert(val =3D=3D -1); error_free_or_abort(&err); =20 /* A non-enum property name */ @@ -498,6 +499,7 @@ static void test_dummy_getenum(void) "iv", "DummyAnimal", &err); + g_assert(val =3D=3D -1); error_free_or_abort(&err); =20 object_unparent(OBJECT(dobj)); --=20 2.26.2 From nobody Sat May 4 02:59:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1600347525; cv=none; d=zohomail.com; s=zohoarc; b=W9+VGsjE9rgfLHKSErbC5lvdaPxMDUVUGBEEozn8FqbBCKkTXqB8h4ZLyTN4wK0TbF9/T/xiqQhBZew5PQTBRvauD2hjUuGjvCTt/1WhHq+peIlaZqqrdF6d1uyWSWJ0/yzYsEzO7rPZUIv9Y35zJbve+tqSRyMgptLzDfBWsY8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600347525; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cjJfqlQma7z3TD8pd8Ml0vQMvR2GQ25+ZiU+C41xfcQ=; b=mryXU1s66Vv1LyXEeJAiJtBQ4KWbPOyar2OBvnwNLLDbSEFzCxrvWddNnVO28aGRxQ8GQePOfYIjXPRE03vSKdUoqJ+bx7cOvy/S/BvI9+ygqsUrGLvfgMunH1YiQHjvfQlx8BlJZt4nSgbH2yqD01+iLNDa+Id4KWPvddPd7L0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600347525184874.9272589365497; Thu, 17 Sep 2020 05:58:45 -0700 (PDT) Received: from localhost ([::1]:42162 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kItUq-0006Pg-3o for importer@patchew.org; Thu, 17 Sep 2020 08:58:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44702) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kItSX-0003vj-E9 for qemu-devel@nongnu.org; Thu, 17 Sep 2020 08:56:21 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:36855 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kItSV-000889-Of for qemu-devel@nongnu.org; Thu, 17 Sep 2020 08:56:21 -0400 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-254-iZwdrRaqNBSrrO4UTOq1Gw-1; Thu, 17 Sep 2020 08:56:16 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 414A48AB382; Thu, 17 Sep 2020 12:55:42 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-114-66.ams2.redhat.com [10.36.114.66]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0AEAF7E731; Thu, 17 Sep 2020 12:55:42 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 7D08911386A3; Thu, 17 Sep 2020 14:55:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600347378; 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=cjJfqlQma7z3TD8pd8Ml0vQMvR2GQ25+ZiU+C41xfcQ=; b=Uc2bg34clD0nZgBRiKyjeTQpDMNspk2mxHcSurWuvxgpUmVvVZSn8S+o1z7Fa69v/Z0Le4 ch3zrE8/W8/WfRDs4DDa+IO8zezfvLjagSnYVy1qSQuUkqPgr1GtwtZXQfQO6FCGtEwdK1 b1VWkav6CpoFuwdmA5pSDrUwuyRUcTc= X-MC-Unique: iZwdrRaqNBSrrO4UTOq1Gw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 2/2] qom: Correct error values in two contracts Date: Thu, 17 Sep 2020 14:55:40 +0200 Message-Id: <20200917125540.597786-3-armbru@redhat.com> In-Reply-To: <20200917125540.597786-1-armbru@redhat.com> References: <20200917125540.597786-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=205.139.110.61; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/17 08:56:18 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.997, 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_H2=-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: pbonzini@redhat.com, berrange@redhat.com, ehabkost@redhat.com, groug@kaod.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" object_property_get_bool()'s contract claims it returns NULL on error. Pasto; it returns false. object_property_get_int()'s contract claims it returns "negative". It actually returns -1. All the other object_property_get_FOO() contracts specify the exact error value, so do the same here. Signed-off-by: Markus Armbruster Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Greg Kurz --- include/qom/object.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/qom/object.h b/include/qom/object.h index f75547a3fe..d0a3332c1f 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -1624,7 +1624,7 @@ bool object_property_set_bool(Object *obj, const char= *name, * @name: the name of the property * @errp: returns an error if this function fails * - * Returns: the value of the property, converted to a boolean, or NULL if + * Returns: the value of the property, converted to a boolean, or false if * an error occurs (including when the property value is not a bool). */ bool object_property_get_bool(Object *obj, const char *name, @@ -1649,7 +1649,7 @@ bool object_property_set_int(Object *obj, const char = *name, * @name: the name of the property * @errp: returns an error if this function fails * - * Returns: the value of the property, converted to an integer, or negativ= e if + * Returns: the value of the property, converted to an integer, or -1 if * an error occurs (including when the property value is not an integer). */ int64_t object_property_get_int(Object *obj, const char *name, --=20 2.26.2