From patchwork Fri Jan 22 09:26:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Valentin Rakush X-Patchwork-Id: 8088511 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 288399F1CC for ; Fri, 22 Jan 2016 09:27:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2EDC820454 for ; Fri, 22 Jan 2016 09:27:33 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2FA6120434 for ; Fri, 22 Jan 2016 09:27:32 +0000 (UTC) Received: from localhost ([::1]:51676 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aMY0B-0002Uy-CG for patchwork-qemu-devel@patchwork.kernel.org; Fri, 22 Jan 2016 04:27:31 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39762) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aMY00-0002Ud-BS for qemu-devel@nongnu.org; Fri, 22 Jan 2016 04:27:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aMXzx-00075v-5K for qemu-devel@nongnu.org; Fri, 22 Jan 2016 04:27:20 -0500 Received: from mail-lb0-x242.google.com ([2a00:1450:4010:c04::242]:36583) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aMXzw-00074t-No for qemu-devel@nongnu.org; Fri, 22 Jan 2016 04:27:17 -0500 Received: by mail-lb0-x242.google.com with SMTP id ad5so2759304lbc.3 for ; Fri, 22 Jan 2016 01:27:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=GLKrKAZ0XRLgnPPiadeT/blgpBWw9NxTf2ILH/dPFvw=; b=zR74+Z3xsiCTiTeKWXx/YQPtHXKFynDDODlNMjVgYqeV2Y2adofo9+b67KpNIGDKrJ JZzsIPUe535DZ9FXJbQEljveyLxNPIojSQWOOWkk4xpg9OMFXYMcQQ4ztRgQqx+fJNKK 4N8sv4bpzDohgrMaLFzxeyq3Qiu6CNIJf6nyT85Vf4abmcSaw64N4nhXu2JIPbC+eOjZ 8SrSdH6xzJtM1ymjqjudm/4+Q15kXy8vC8DsUvfc5SoIOsDEPykGOzLJWE9YEXYtNArY BH/kvaxMTxHEi8AKjKIYPnO22dsfKeuPoRhq0S/U9EwH4I/F+XCYEJy7ZJKl+V8kLAjG gW4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-type:content-transfer-encoding; bh=GLKrKAZ0XRLgnPPiadeT/blgpBWw9NxTf2ILH/dPFvw=; b=L8mVMd59+Hp/RAB1UYcxdNFX0O7j57uBp7vxkTU45OpXFBVpwEZeesWg5p+1fzYPjV 6wN/sbLdoLUI//dS4jtg/Kk9d8XDxqP3ZGFXY00sTVfN8tDQwHy6vzNk4Nnvr2CXyHW0 vp90Q+CsudwMgufMMHXOU8HtVg7ZCcIh8w7vsfpGCx0J+jsc1dCyF1KnVs3w8DoUa9bp ciTMyzTo6+4p4OfgwDbpit6dyGHG7YQ9tulDly8tB3D1igjcIm5I2x5c4W9DsCX+4skU g7cuPQ3j0AOc18PjsAo/eR+u9aVgwl+68rth48kJmjVsL+WKmhfywRFkdMK0hsVLx75n zq8A== X-Gm-Message-State: AG10YOR3KL5N+6dj0QOUubsjFwqaxGhwm+Jb3iXpo9dTYOviy7kPuLqegKUMQybjd1aYJg== X-Received: by 10.112.62.165 with SMTP id z5mr654146lbr.89.1453454835748; Fri, 22 Jan 2016 01:27:15 -0800 (PST) Received: from vrakush.its.local (mail.itspartner.net. [80.249.81.165]) by smtp.gmail.com with ESMTPSA id mx4sm742413lbc.30.2016.01.22.01.27.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Jan 2016 01:27:14 -0800 (PST) From: Valentin Rakush To: qemu-devel@nongnu.org Date: Fri, 22 Jan 2016 12:26:52 +0300 Message-Id: <1453454812-29232-1-git-send-email-valentin.rakush@gmail.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:4010:c04::242 Cc: armbru@redhat.com, lcapitulino@redhat.com, asmetanin@virtuozzo.com, den@openvz.org, Valentin Rakush , afaerber@suse.de Subject: [Qemu-devel] [PATCH v3] qom, qmp, hmp, qapi: create qom-type-prop-list for class properties X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds support for qom-type-prop-list command to list object class properties. A later patch will use this functionality to implement x86_64-cpu properties. Signed-off-by: Valentin Rakush Cc: Luiz Capitulino Cc: Eric Blake Cc: Markus Armbruster Cc: Andreas Färber Cc: Daniel P. Berrange --- V2: Fixes after first review - changed command name from qom-type-list to qom-type-prop-list - changed memory allocation from g_malloc0 to g_new0 - changed parameter name from path to typename - fixed wordings and comments - fixed source code formatting - registered the command in monitor V3: commit message fix - commit message changed to reflect actual command name hmp-commands.hx | 13 +++++++++++++ hmp.c | 26 ++++++++++++++++++++++++++ hmp.h | 1 + include/qom/object.h | 31 +++++++++++++++++++++++++++++++ qapi-schema.json | 19 +++++++++++++++++++ qmp-commands.hx | 6 ++++++ qmp.c | 32 ++++++++++++++++++++++++++++++++ qom/object.c | 7 +++++++ 8 files changed, 135 insertions(+) diff --git a/hmp-commands.hx b/hmp-commands.hx index bb52e4d..0aca653 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1734,6 +1734,19 @@ Print QOM properties of object at location @var{path} ETEXI { + .name = "qom-type-prop-list", + .args_type = "typename:s?", + .params = "typename", + .help = "list QOM class properties", + .mhandler.cmd = hmp_qom_type_prop_list, + }, + +STEXI +@item qom-type-prop-list [@var{typename}] +Print QOM properties of the type @var{typename} +ETEXI + + { .name = "qom-set", .args_type = "path:s,property:s,value:s", .params = "path property value", diff --git a/hmp.c b/hmp.c index 54f2620..4bad6a1 100644 --- a/hmp.c +++ b/hmp.c @@ -2052,6 +2052,32 @@ void hmp_qom_list(Monitor *mon, const QDict *qdict) hmp_handle_error(mon, &err); } +void hmp_qom_type_prop_list(Monitor *mon, const QDict *qdict) +{ + const char *path = qdict_get_try_str(qdict, "path"); + ObjectPropertyInfoList *list; + Error *err = NULL; + + if (!path) { + monitor_printf(mon, "/\n"); + return; + } + + list = qmp_qom_type_prop_list(path, &err); + if (!err) { + ObjectPropertyInfoList *start = list; + while (list) { + ObjectPropertyInfo *value = list->value; + + monitor_printf(mon, "%s (%s)\n", + value->name, value->type); + list = list->next; + } + qapi_free_ObjectPropertyInfoList(start); + } + hmp_handle_error(mon, &err); +} + void hmp_qom_set(Monitor *mon, const QDict *qdict) { const char *path = qdict_get_str(qdict, "path"); diff --git a/hmp.h b/hmp.h index a8c5b5a..8c12ebe 100644 --- a/hmp.h +++ b/hmp.h @@ -103,6 +103,7 @@ void hmp_object_del(Monitor *mon, const QDict *qdict); void hmp_info_memdev(Monitor *mon, const QDict *qdict); void hmp_info_memory_devices(Monitor *mon, const QDict *qdict); void hmp_qom_list(Monitor *mon, const QDict *qdict); +void hmp_qom_type_prop_list(Monitor *mon, const QDict *qdict); void hmp_qom_set(Monitor *mon, const QDict *qdict); void object_add_completion(ReadLineState *rs, int nb_args, const char *str); void object_del_completion(ReadLineState *rs, int nb_args, const char *str); diff --git a/include/qom/object.h b/include/qom/object.h index d0dafe9..0c8379d 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -1013,6 +1013,37 @@ void object_property_iter_init(ObjectPropertyIterator *iter, */ ObjectProperty *object_property_iter_next(ObjectPropertyIterator *iter); +/** + * object_class_property_iter_init: + * @klass: the class owning the properties to be iterated over + * + * Initializes an iterator for traversing all properties + * registered against a class type and all parent classes. + * + * It is forbidden to modify the property list while iterating, + * whether removing or adding properties. + * + * NB For getting next property in the list the object related + * function object_property_iter_next is still used. + * + * Typical usage pattern would be + * + * + * Using object class property iterators + * + * ObjectProperty *prop; + * ObjectPropertyIterator iter; + * + * object_class property_iter_init(&iter, obj); + * while ((prop = object_property_iter_next(&iter))) { + * ... do something with prop ... + * } + * + * + */ +void object_class_property_iter_init(ObjectPropertyIterator *iter, + ObjectClass *klass); + void object_unparent(Object *obj); /** diff --git a/qapi-schema.json b/qapi-schema.json index b3038b2..2e960db 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -4081,3 +4081,22 @@ ## { 'enum': 'ReplayMode', 'data': [ 'none', 'record', 'play' ] } + +## +# @qom-type-prop-list: +# +# This command will list any properties of an object class +# given its typename. +# +# @typename: the typename of the class. See @qom-list-types to check +# available typenames. +# +# Returns: a list of @ObjectPropertyInfo that describe the properties +# of the class. +# +# Since: 2.6 +## +{ 'command': 'qom-type-prop-list', + 'data': { 'typename': 'str' }, + 'returns': [ 'ObjectPropertyInfo' ] } + diff --git a/qmp-commands.hx b/qmp-commands.hx index db072a6..d3be962 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -3789,6 +3789,12 @@ EQMP }, { + .name = "qom-type-prop-list", + .args_type = "typename:s", + .mhandler.cmd_new = qmp_marshal_qom_type_prop_list, + }, + + { .name = "qom-set", .args_type = "path:s,property:s,value:q", .mhandler.cmd_new = qmp_marshal_qom_set, diff --git a/qmp.c b/qmp.c index 53affe2..643e4bc 100644 --- a/qmp.c +++ b/qmp.c @@ -460,6 +460,38 @@ ObjectTypeInfoList *qmp_qom_list_types(bool has_implements, return ret; } +ObjectPropertyInfoList *qmp_qom_type_prop_list(const char *typename, Error **errp) +{ + ObjectClass *klass; + ObjectPropertyInfoList *props = NULL; + ObjectProperty* prop; + ObjectPropertyIterator iter; + + klass = object_class_by_name(typename); + if (!klass) { + error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND, + "Object class '%s' not found", typename); + return NULL; + } + + object_class_property_iter_init(&iter, klass); + while ((prop = object_property_iter_next(&iter))) { + ObjectPropertyInfoList *entry = g_new0(ObjectPropertyInfoList, 1); + + if (entry) + { + entry->value = g_new0(ObjectPropertyInfo, 1); + entry->next = props; + props = entry; + + entry->value->name = g_strdup(prop->name); + entry->value->type = g_strdup(prop->type); + } + } + + return props; +} + /* Return a DevicePropertyInfo for a qdev property. * * If a qdev property with the given name does not exist, use the given default diff --git a/qom/object.c b/qom/object.c index 5ff97ab..cabd91d 100644 --- a/qom/object.c +++ b/qom/object.c @@ -994,6 +994,13 @@ ObjectProperty *object_property_find(Object *obj, const char *name, return NULL; } +void object_class_property_iter_init(ObjectPropertyIterator *iter, + ObjectClass *klass) +{ + g_hash_table_iter_init(&iter->iter, klass->properties); + iter->nextclass = object_class_get_parent(klass); +} + void object_property_iter_init(ObjectPropertyIterator *iter, Object *obj) {