From nobody Sat Oct 25 09:07:51 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520342821336184.30793636366218; Tue, 6 Mar 2018 05:27:01 -0800 (PST) Received: from localhost ([::1]:55732 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etCcO-0003jM-Ez for importer@patchew.org; Tue, 06 Mar 2018 08:27:00 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48004) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etCVO-0004mQ-07 for qemu-devel@nongnu.org; Tue, 06 Mar 2018 08:19:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etCVM-0006Ek-M4 for qemu-devel@nongnu.org; Tue, 06 Mar 2018 08:19:45 -0500 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]:38598) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1etCVM-0006Dy-Cw for qemu-devel@nongnu.org; Tue, 06 Mar 2018 08:19:44 -0500 Received: by mail-wr0-x242.google.com with SMTP id n7so20915594wrn.5 for ; Tue, 06 Mar 2018 05:19:44 -0800 (PST) Received: from 640k.lan (94-36-191-219.adsl-ull.clienti.tiscali.it. [94.36.191.219]) by smtp.gmail.com with ESMTPSA id l38sm25652538wrc.96.2018.03.06.05.19.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Mar 2018 05:19:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=FA3dueBTvWbvB24Dqdt7eQRaGTBZz6g82dqP1EHG2S0=; b=u1aqbinRxUJbnRDkpybYg//Ftt0CAbmFOLMtYUmFdtvZKvfydM8WB7YKA48GiRJWuy wT3X25xK2xGsaG4ytkRZ94liSKGWZ49zTMMTG39USkP0Rhb1rdYizKIr0SlKu+SNe/r+ nH+52VsBP+un7/L8inPgPIZtcOfLjGRjoUP2QnPvP60pN4GvTcsE1AUJiqFg+O/i+2Z+ dlEjMdC5eMO+J029MBcdTiMUIioLd7IaF1w342Du+5DE4CIWXpDeIknBV+E0PeKV+R6/ Q2UU7x/djSNPBL/GIXp/VIFeGBSNkGosCQ9uL8ZK6cMUTrjEomjQvAUbR/eTl2F3k4WW e4mA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=FA3dueBTvWbvB24Dqdt7eQRaGTBZz6g82dqP1EHG2S0=; b=FDWL3KTyHSXkRLznxJR6fvRwpQ+ZaAraVDvkQA1c6W1XALnHkdffFXsX3KhYAUYcrt 2jjuR6Y1CVY4lhu8iACABJ58QoMNr3jQScc9CjmF7R0ldBgD2kGPKIv9fZcMT1dRGMEJ 6+TfwgQcJTKjaGDC1rRAUm6L9Q4XXj5kelPjhi1isYXx+Kxtgy1fWilBU/XJLyTcuNai wgW9uZeJcMsWLPI1oBtT7QcNtcPG3MxWWy1fMfZOlGaCPSOBOv+tPHiLRBwRceZDIGgS mEsSik3FlTuk68FNdoH9gnCTQCKzTd5jFWdSbDCtLT8EW/TG6S8zSj0ALNdDdn3aFg8F 2c6A== X-Gm-Message-State: APf1xPCcUkGNx4QKU6tZCx4+9RTXEBrYCrol6pDogn1XLejWpkcxl7MK zXQMoh0N66qnGeOYZNbi53iM9b+U X-Google-Smtp-Source: AG47ELsCU+KCnyaiOmpwaETKl9itbZcU8KP/A29L7QfLU4+8qLmY1Ma7qGD91AWtngFQMWLKT6cT4w== X-Received: by 10.223.182.174 with SMTP id j46mr16882027wre.43.1520342382995; Tue, 06 Mar 2018 05:19:42 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 6 Mar 2018 14:19:04 +0100 Message-Id: <1520342370-123606-9-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1520342370-123606-1-git-send-email-pbonzini@redhat.com> References: <1520342370-123606-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::242 Subject: [Qemu-devel] [PULL 08/34] qmp: Merge ObjectPropertyInfo and DevicePropertyInfo X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexey Kardashevskiy Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Alexey Kardashevskiy ObjectPropertyInfo is more generic and only missing @description. This adds a description to ObjectPropertyInfo and removes DevicePropertyInfo so the resulting ObjectPropertyInfo can be used elsewhere. Signed-off-by: Alexey Kardashevskiy Message-Id: <20180301130939.15875-2-aik@ozlabs.ru> Signed-off-by: Paolo Bonzini --- qapi/misc.json | 23 +++++------------------ qdev-monitor.c | 6 +++--- qmp.c | 20 ++++++++++---------- 3 files changed, 18 insertions(+), 31 deletions(-) diff --git a/qapi/misc.json b/qapi/misc.json index a1702c9..fb9f41d 100644 --- a/qapi/misc.json +++ b/qapi/misc.json @@ -1285,10 +1285,12 @@ # 3) A link type in the form 'link' where subtype is a qdev # device type name. Link properties form the device model graph. # +# @description: if specified, the description of the property. +# # Since: 1.2 ## { 'struct': 'ObjectPropertyInfo', - 'data': { 'name': 'str', 'type': 'str' } } + 'data': { 'name': 'str', 'type': 'str', '*description': 'str' } } =20 ## # @qom-list: @@ -1444,34 +1446,19 @@ 'returns': [ 'ObjectTypeInfo' ] } =20 ## -# @DevicePropertyInfo: -# -# Information about device properties. -# -# @name: the name of the property -# @type: the typename of the property -# @description: if specified, the description of the property. -# (since 2.2) -# -# Since: 1.2 -## -{ 'struct': 'DevicePropertyInfo', - 'data': { 'name': 'str', 'type': 'str', '*description': 'str' } } - -## # @device-list-properties: # # List properties associated with a device. # # @typename: the type name of a device # -# Returns: a list of DevicePropertyInfo describing a devices properties +# Returns: a list of ObjectPropertyInfo describing a devices properties # # Since: 1.2 ## { 'command': 'device-list-properties', 'data': { 'typename': 'str'}, - 'returns': [ 'DevicePropertyInfo' ] } + 'returns': [ 'ObjectPropertyInfo' ] } =20 ## # @xen-set-global-dirty-log: diff --git a/qdev-monitor.c b/qdev-monitor.c index b8f6bc3..b7e3291 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -258,8 +258,8 @@ int qdev_device_help(QemuOpts *opts) { Error *local_err =3D NULL; const char *driver; - DevicePropertyInfoList *prop_list; - DevicePropertyInfoList *prop; + ObjectPropertyInfoList *prop_list; + ObjectPropertyInfoList *prop; =20 driver =3D qemu_opt_get(opts, "driver"); if (driver && is_help_option(driver)) { @@ -295,7 +295,7 @@ int qdev_device_help(QemuOpts *opts) } } =20 - qapi_free_DevicePropertyInfoList(prop_list); + qapi_free_ObjectPropertyInfoList(prop_list); return 1; =20 error: diff --git a/qmp.c b/qmp.c index ba82e1d..66332c3 100644 --- a/qmp.c +++ b/qmp.c @@ -465,12 +465,12 @@ ObjectTypeInfoList *qmp_qom_list_types(bool has_imple= ments, * * The caller must free the return value. */ -static DevicePropertyInfo *make_device_property_info(ObjectClass *klass, - const char *name, - const char *default_t= ype, - const char *descripti= on) +static ObjectPropertyInfo *make_device_property_info(ObjectClass *klass, + const char *name, + const char *default_type, + const char *description) { - DevicePropertyInfo *info; + ObjectPropertyInfo *info; Property *prop; =20 do { @@ -510,14 +510,14 @@ static DevicePropertyInfo *make_device_property_info(= ObjectClass *klass, return info; } =20 -DevicePropertyInfoList *qmp_device_list_properties(const char *typename, - Error **errp) +ObjectPropertyInfoList *qmp_device_list_properties(const char *typename, + Error **errp) { ObjectClass *klass; Object *obj; ObjectProperty *prop; ObjectPropertyIterator iter; - DevicePropertyInfoList *prop_list =3D NULL; + ObjectPropertyInfoList *prop_list =3D NULL; =20 klass =3D object_class_by_name(typename); if (klass =3D=3D NULL) { @@ -542,8 +542,8 @@ DevicePropertyInfoList *qmp_device_list_properties(cons= t char *typename, =20 object_property_iter_init(&iter, obj); while ((prop =3D object_property_iter_next(&iter))) { - DevicePropertyInfo *info; - DevicePropertyInfoList *entry; + ObjectPropertyInfo *info; + ObjectPropertyInfoList *entry; =20 /* Skip Object and DeviceState properties */ if (strcmp(prop->name, "type") =3D=3D 0 || --=20 1.8.3.1