From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B6AFAC2D0DB for ; Thu, 23 Jan 2020 17:12:33 +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 81A8620704 for ; Thu, 23 Jan 2020 17:12:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="I468Uft0" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 81A8620704 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:33122 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iug1v-0007hk-Tr for qemu-devel@archiver.kernel.org; Thu, 23 Jan 2020 12:12:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53130) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iucua-0001hk-Vm for qemu-devel@nongnu.org; Thu, 23 Jan 2020 08:52:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iucuZ-0001OA-Nf for qemu-devel@nongnu.org; Thu, 23 Jan 2020 08:52:44 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:43764 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iucuZ-0001O5-KZ for qemu-devel@nongnu.org; Thu, 23 Jan 2020 08:52:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579787563; 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=weOrfJYvElx9PXPFZdBPW+NgpHelACkPKsnOgUcLfqs=; b=I468Uft0AmHUngK356HWNkn85zSgLUgAawMLkbnl5WFA2M0GwxchwbzSRUntztmtpLpr19 sjXBCNAPpQfF3LRIVMpdIeEHrAYaOJb+jKm+3Gqkwo+fy+zmXZ5+kVXbzvjR4692AB1d95 unzfSQRe2PqCwFhzxK9V6Nb/nfjydFU= 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-181-RwfwdZTYOlGAXljdCCwX4w-1; Thu, 23 Jan 2020 08:52:41 -0500 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 BA5A0939D7 for ; Thu, 23 Jan 2020 13:52:40 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.112.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id B814F1CB; Thu, 23 Jan 2020 13:52:39 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 53/59] qom: simplify qmp_device_list_properties() Date: Thu, 23 Jan 2020 14:50:43 +0100 Message-Id: <1579787449-27599-54-git-send-email-pbonzini@redhat.com> In-Reply-To: <1579787449-27599-1-git-send-email-pbonzini@redhat.com> References: <1579787449-27599-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: RwfwdZTYOlGAXljdCCwX4w-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 207.211.31.81 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?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" All qdev properties are object properties, no need for make_device_property_info() helper. Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20200110153039.1379601-24-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- qom/qom-qmp-cmds.c | 52 +++++---------------------------------------------= -- 1 file changed, 5 insertions(+), 47 deletions(-) diff --git a/qom/qom-qmp-cmds.c b/qom/qom-qmp-cmds.c index ccd3aaa..8785816 100644 --- a/qom/qom-qmp-cmds.c +++ b/qom/qom-qmp-cmds.c @@ -121,48 +121,6 @@ ObjectTypeInfoList *qmp_qom_list_types(bool has_implem= ents, return ret; } =20 -/* Return a DevicePropertyInfo for a qdev property. - * - * If a qdev property with the given name does not exist, use the given de= fault - * type. If the qdev property info should not be shown, return NULL. - * - * The caller must free the return value. - */ -static ObjectPropertyInfo *make_device_property_info(ObjectClass *klass, - const char *name, - const char *default_type= , - const char *description) -{ - ObjectPropertyInfo *info; - Property *prop; - - do { - for (prop =3D DEVICE_CLASS(klass)->props_; prop && prop->name; pro= p++) { - if (strcmp(name, prop->name) !=3D 0) { - continue; - } - - info =3D g_malloc0(sizeof(*info)); - info->name =3D g_strdup(prop->name); - info->type =3D default_type ? g_strdup(default_type) - : g_strdup(prop->info->name); - info->has_description =3D !!prop->info->description; - info->description =3D g_strdup(prop->info->description); - return info; - } - klass =3D object_class_get_parent(klass); - } while (klass !=3D object_class_by_name(TYPE_DEVICE)); - - /* Not a qdev property, use the default type */ - info =3D g_malloc0(sizeof(*info)); - info->name =3D g_strdup(name); - info->type =3D g_strdup(default_type); - info->has_description =3D !!description; - info->description =3D g_strdup(description); - - return info; -} - ObjectPropertyInfoList *qmp_device_list_properties(const char *typename, Error **errp) { @@ -214,11 +172,11 @@ ObjectPropertyInfoList *qmp_device_list_properties(co= nst char *typename, continue; } =20 - info =3D make_device_property_info(klass, prop->name, prop->type, - prop->description); - if (!info) { - continue; - } + info =3D g_new0(ObjectPropertyInfo, 1); + info->name =3D g_strdup(prop->name); + info->type =3D g_strdup(prop->type); + info->has_description =3D !!prop->description; + info->description =3D g_strdup(prop->description); =20 entry =3D g_malloc0(sizeof(*entry)); entry->value =3D info; --=20 1.8.3.1