From nobody Mon Feb 9 11:30:24 2026 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=1589523208; cv=none; d=zohomail.com; s=zohoarc; b=R4emH/jgqb3jnhWGgJuN/rEzR8MuXEsDPRinNiRkJmdvDU0/IahhE20m8adRCK5omjpyvMUHuaRMDfo7zsx0g0Ue9rb8UGhBFiu5HXIsZuE2dsBkOqJkDkXb53QenauhMmTyU/rwFmRY7/oRN2aER8Isjh3LbpYRwwxsKmQX+Bs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589523208; 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=BrSbp9YJO2wMm0eUyLPKhUB5JoF5C8SLfuU16DehAGk=; b=gt7h4CeksDS3guNjkwRTQIfoIXpfm2tvNhRU8Vmhy0+rBC8PFFiX5m4SNR5GIyIPjKK2K8ZlXYr5UhPRQCiVUhZ6WR2RpyqBvjifxWS7Ktu2Nkos43aFcDTYA9CDGUIpUz732YXORZg6e0ZN1yGLr4LbHeLSr6K0FAIWUVB+HRs= 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 1589523208717842.8465478183396; Thu, 14 May 2020 23:13:28 -0700 (PDT) Received: from localhost ([::1]:43162 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jZTb5-0008Kr-BC for importer@patchew.org; Fri, 15 May 2020 02:13:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55900) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZTSU-00034i-AD for qemu-devel@nongnu.org; Fri, 15 May 2020 02:04:34 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:51408 helo=us-smtp-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 1jZTSR-0004Qm-OL for qemu-devel@nongnu.org; Fri, 15 May 2020 02:04:33 -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-417-uOLvFvfzNyqfLHboNss3Iw-1; Fri, 15 May 2020 02:04:26 -0400 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 E1E591005510 for ; Fri, 15 May 2020 06:04:25 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-113-6.ams2.redhat.com [10.36.113.6]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B2ADA2E163; Fri, 15 May 2020 06:04:25 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 32E8611358C0; Fri, 15 May 2020 08:04:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589522671; 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=BrSbp9YJO2wMm0eUyLPKhUB5JoF5C8SLfuU16DehAGk=; b=WNGsxRm0QVSehcm9GWj1uKWBpzAh8Sb/XvKYVvsDsCFALu10edVM0znPpb3pdm4r7w+jYU iJ7nZPaxMKpCQkVLNtUXz7cfP2b+9SakSGxbHys1Jobn7yTThGbqh5A5At3IIvonaZRneh ceQxrCLAmM5BhYiwpdKv9eR9Qx6i5TY= X-MC-Unique: uOLvFvfzNyqfLHboNss3Iw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 04/21] qom: Simplify object_property_get_enum() Date: Fri, 15 May 2020 08:04:07 +0200 Message-Id: <20200515060424.18993-5-armbru@redhat.com> In-Reply-To: <20200515060424.18993-1-armbru@redhat.com> References: <20200515060424.18993-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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=207.211.31.120; envelope-from=armbru@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/14 22:56:02 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_H2=-0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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 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" Reuse object_property_get_str(). Switches from the string to the qobject visitor under the hood. Signed-off-by: Markus Armbruster Message-Id: <20200505152926.18877-5-armbru@redhat.com> Reviewed-by: Paolo Bonzini --- qom/object.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/qom/object.c b/qom/object.c index 3d65658059..b374af302c 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1521,8 +1521,6 @@ typedef struct EnumProperty { int object_property_get_enum(Object *obj, const char *name, const char *typename, Error **errp) { - Error *err =3D NULL; - Visitor *v; char *str; int ret; ObjectProperty *prop =3D object_property_find(obj, name, errp); @@ -1541,15 +1539,10 @@ int object_property_get_enum(Object *obj, const cha= r *name, =20 enumprop =3D prop->opaque; =20 - v =3D string_output_visitor_new(false, &str); - object_property_get(obj, v, name, &err); - if (err) { - error_propagate(errp, err); - visit_free(v); + str =3D object_property_get_str(obj, name, errp); + if (!str) { return 0; } - visit_complete(v, &str); - visit_free(v); =20 ret =3D qapi_enum_parse(enumprop->lookup, str, -1, errp); g_free(str); --=20 2.21.1