From nobody Sat May 18 19:47:47 2024 Delivered-To: importer@patchew.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=nokia.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1527867740495857.2884550307145; Fri, 1 Jun 2018 08:42:20 -0700 (PDT) Received: from localhost ([::1]:56270 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOmC1-0005dq-Fj for importer@patchew.org; Fri, 01 Jun 2018 11:42:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57155) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOm9k-00048b-CW for qemu-devel@nongnu.org; Fri, 01 Jun 2018 11:39:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fOm9g-00041Y-Ej for qemu-devel@nongnu.org; Fri, 01 Jun 2018 11:39:56 -0400 Received: from mail-ve1eur01on0111.outbound.protection.outlook.com ([104.47.1.111]:57696 helo=EUR01-VE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fOm9f-00040K-Ql for qemu-devel@nongnu.org; Fri, 01 Jun 2018 11:39:52 -0400 Received: from localhost.localdomain (87.66.184.67) by AMSPR07MB277.eurprd07.prod.outlook.com (2a01:111:e400:802c::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.820.5; Fri, 1 Jun 2018 15:39:48 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nokia.onmicrosoft.com; s=selector1-nokia-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sz2sJVikBhI+QxY4Tt/BX4Fj+YN3nBvE6ZvKsLb8Xhs=; b=P/EPNINax10qMUlzsGVx7svk1vrYmclPpKB1nQ0rf1MYxJXQyiyVNa2zfp2vBa+OokRn4Q8CTDH3SnAXVC4SJ7CsR5bTB8pz70KYsON7VtrQAJfgoaEZdpSc7zg9HcT4ebfOUtfiFylvk3svGLY+s9TTlaeD/F8Jz/dmK9nraUk= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=ricardo.perez_blanco@nokia.com; From: Ricardo Perez Blanco To: Date: Fri, 1 Jun 2018 17:39:22 +0200 Message-Id: <20180601153922.11590-1-ricardo.perez_blanco@nokia.com> X-Mailer: git-send-email 2.16.3 MIME-Version: 1.0 X-Originating-IP: [87.66.184.67] X-ClientProxiedBy: AM6P193CA0035.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:3e::48) To AMSPR07MB277.eurprd07.prod.outlook.com (2a01:111:e400:802c::25) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:(109105607167333); BCL:0; PCL:0; RULEID:(7020095)(4652020)(8989080)(5600026)(48565401081)(2017052603328)(7193020); SRVR:AMSPR07MB277; X-Microsoft-Exchange-Diagnostics: 1; AMSPR07MB277; 3:ufm4CFwJlaMznLDkmhREENBcGf8bz2ttzPFO+740Rp88E+vYSYjN7W33q0045nrX6bbmZtdwOQBP7MyLX8XWDGhJkESpQec5NdhYKlNAunKlzMs/yZEqYTnULGXTgna8AMvlK+cxHPSdML2/ql7H3sTeR93JPxCkN19uG/LokdtMXVqcgM/3sJSDJxWp5MmYIrSrPaNBc3hB8KcgZXoWu9ekt4HppbKgaSbjcPAHinQrAmqCj4o4MxccjHD5gMmPE8xLkMkmOuIxrmNeakh5sct5X7+cuCR9mS23nBdyXUQ=; 25:D9S0yxaLLI04wlOvy7hRjynFSyGNcAIgy5w/n9y+zA1qOlKFZNhA99WXLWfMYS+/hMPcakFMvqhQ7AjC5mDqil0CeatLjfYhLbVScM2r+FqbiArORNh3q43YnBQipKZ99Nh8PPjTpnJfnaE6vn/roiutO2qDWOvh/kcTCZyxOcWeFzf8xzaMe1kAOCVxtWx/ZnaMCeqLEDgvYsfpFfC9V0GPOwKG80He2mgip7AM54MFfntlBUdCu0JetRlJ7kTKNGdzCrF9tHJ940M5xzVz//15qMvpdYovGJHwhNyXhs1TmgDDRUJpez/E9LE3St+U/o+FKH9peEQ+rBMRruOVgQ==; 31:t1FFUytdAoCd3cufpm2Srb9N7pIqTeS686piKCEEda47qi0yTxva7qPr/S2UAXmzFQNJr6DQVLH+XpckzWCu7w6vSHBfe+zkOZXB26tHyU11J3FaIjzEz9MfDCMDr0Qhgs9MJ+8HdN4bMGyeIrFeWGjBc94lW0BhLQzNgeQ674aI0gEoIBSd7gWRIfIb1MU+rJKl9QkqslUXlGyCeiy2f2OME76Mh6wwy4OidzT7URo= X-MS-TrafficTypeDiagnostic: AMSPR07MB277: X-Microsoft-Exchange-Diagnostics: 1; AMSPR07MB277; 20:Wxm2L0n4eR+u2+0JszPN8XmxUZj3mF4NxYKWUAmv0QM6L8IP42aMHmtKt3nP4lRWJh7U0z6u2MPnfwI2QpkBrcFzPk4mdZfLhvfDXMQdqP6k4Mi/iMbCFhxcdSlANjZBZwJZrX6r61BuH0GVSDcDAFs1aZEpF94e1FKF0+ofbu8FCP7rOO0TnabIGJSs5T8aiMau6bTgGhJmPoQ6vZKHyj+80yxouNKy1EYLBUXKeemt7Q61GZZ0Lzt+Ko7DSeDF+7lLKea5iIk9nHBecalP53K7a1k31tq809wzEiSFot2piIUHYL7QbJaHnXlXY5EJwgM/R0gs/k+WmL/bu6K1dF7Z4mgqOf3AR/azKy3jD2A0tEKgwPT0gIND6DnfJpXkm53G4BuOW8WZOsXrJpGnNoD+h7jE6FJ/tSo5Y+SC3Z+gEZOvwOrTA0bf5igHLMnGKSNrJoSIW+gwaGKsxBoA13txYV6IHxsThhY/j9ZvNuFVN53GF2mPE1eCttvcOfXY; 4:bUKqYFjq95zFdXryp1vD6OVR2z++r0w33jWHF2kVakIcnJIZV1dXpU3Zfwz7xnjZfXP2cGPb/Ryw8BA2Q7ojOFICFWbxfGOI67EUxNFbsk8KGXh+JUmT9AHB+7rPraXgpotN1OWSznHnGsdN6yoMioU/QsZRpDwVUg9JRL9TFxBRLrBfKUxR3v8sbpHqX9cLTtIWZrrwskue8xb/1tKbA7vX+eaH7+NCKy6q7NB0SJMiHunVfKe1NbBdwwt4gS53teV2aRXKC9QGwVQ+P4gUtPesctjZDNsHrqbj1dRMvDtAeUnCJyGb9RGk0RJo+yIzOEYapA4qCOW2iTfHz0FtfNXCwsoVeCM76RRVeBu+7eY= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(82608151540597)(109105607167333); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3002001)(3231254)(11241501184)(806099)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:AMSPR07MB277; BCL:0; PCL:0; RULEID:; SRVR:AMSPR07MB277; X-Forefront-PRVS: 0690E5FF22 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6069001)(39860400002)(376002)(39380400002)(346002)(396003)(366004)(50944005)(189003)(199004)(4326008)(386003)(2616005)(1076002)(478600001)(5660300001)(486006)(6666003)(97736004)(476003)(106356001)(50226002)(51416003)(68736007)(6486002)(52116002)(7736002)(16526019)(956004)(8936002)(25786009)(6506007)(1671002)(8676002)(305945005)(105586002)(48376002)(50466002)(81166006)(53936002)(86362001)(54906003)(47776003)(81156014)(16586007)(2906002)(316002)(6512007)(36756003)(3846002)(6116002)(66066001)(109986005)(26005)(266003); DIR:OUT; SFP:1102; SCL:1; SRVR:AMSPR07MB277; H:localhost.localdomain; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; 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; Received-SPF: None (protection.outlook.com: nokia.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AMSPR07MB277; 23:BnQ0ru64s8ADKMR5UgOTmt/1TaeiPlpCi8dtWHk/d8?= =?us-ascii?Q?x+WT14hEHnQK8JvC5yh6Nczky325MopwSrDISibh/yBf+nFwUsC8zgF4y33t?= =?us-ascii?Q?1LUpiF8qdWOjkqy62KgtQu43vUZC9hAnLm6SgIkX1+1/hy5N9YhCZlIlhkGn?= =?us-ascii?Q?jzthDot/BTID3G7TJwOWFdsK8gaAl4LCbq9ofJ0pBL11A7GXPz4+cqiVPW4+?= =?us-ascii?Q?jP8oPgct/5YSFvhR6apnbZSWjL1uWMlmVGLpMl640fGcqEtOGJAfSo9l+NGV?= =?us-ascii?Q?aMykgivwDRWwKayr/1x3+L3LA2Rj2Trel/QtCJuuKE+MDf40AI2JXxUw5qR0?= =?us-ascii?Q?su/XYK1MhIZxBSUTdGNqF3/E+N02En7zQOPnpZglV2JhahrBHw9mZSG5Xqvv?= =?us-ascii?Q?zqjiaFFiu5OjR/j3bh9wm8gPm7v7xr9kWTWiWOIkWKBpr4MNJm4zFugHyiPH?= =?us-ascii?Q?4C7YpDiwYclfoima0YFFeb3o+wcMftnPp9h6WPs8rFkv6xxPB3KUL70Xu+Ev?= =?us-ascii?Q?OwjsGckh3wY3v1xMLCKxRVFJC1uwpWVg63cyjffKvYCVNAEP0ITj+SDRBlDl?= =?us-ascii?Q?bB3B/qBdC1BUwRbhMduGQLIjVjgrsTacy4DKDI/xeDcf8N+TbGcZQBFFNv9+?= =?us-ascii?Q?0ls9Ez6188eVetbmwYbiyUthdkS9nA8lLzbERqULPIkRGDPwyBLfbtY94BEe?= =?us-ascii?Q?WcqTcqkdJ4KwBsZeFcqJzeXsAADTH2JlEGl7Fwgw/lEldmw2tBUTybdWCWOO?= =?us-ascii?Q?YQo6zMg1dp/vEG1xsv0j59Z4ENf+bT/yp1QMoyl5PiRBx+h79kvMnEHbiknQ?= =?us-ascii?Q?v+ZI2fNHGodiI3biyPgXnYbvXidUiyI/ictxWs9wazqR9N5otaHqOom382wu?= =?us-ascii?Q?LgJFAhR9nyCDtGRYkYTtIWycnYb/n3CQv/jePuqUkOjiuNc0OEbMxbrIijA9?= =?us-ascii?Q?mCHBimkQyHWK2yV7bWtCsebRc022NPzpiHD84/g2oWKO3qQpldnV0KrF7Dc+?= =?us-ascii?Q?0U5OBPU8lQOTACV9PTSv/BSk9sSemkF/imrFvBmEPGS8Smtn46znjHtBp2ih?= =?us-ascii?Q?y6lnD/dglAkurj6+C7acZw9WMG6mg20xnwFC57Wu9rUAhm7yvjzCm38dtdPy?= =?us-ascii?Q?DntHKR0RjzRh4a254GUbur9kXJt1wn5B8TNZ/6aiNJR7cEOCYZhYeurQ0ypA?= =?us-ascii?Q?JiMNlyB8rF9CRFAMoj4rk/oj8XHSbzEujdQNgQQlqa+t6kXQvb61QD1w=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Antispam-Message-Info: u4K811xs7bp3z6dgVPb35hii/NyHUn4ZUOGTRylwzwEi6Vl7nMuViJGNeoReGWtt+WZQUNdzcszWll3cscJv8QaNlKyXKapQAER6HkjbM+gpC0ENGFBSKfzO/SaXg7fjnO2YubaBo2PedziKjOGCu1p0jxeis9YJg2fZIJeNDDAdVi5EMGp8/iOWHjLFzHuPCdDBta68sXZtxjzV23sLevn1/rvzyvRTqsWbhBchmRM= X-Microsoft-Exchange-Diagnostics: 1; AMSPR07MB277; 6:4iOm/9+p7HksYKqArCHSU42ZALKUYzr5tY4CW8038/eUCwJDyY5/FyQ6M+2XvVoAtYyOJXcfmVO/AD2BaRbFk3ApM3wRbnWTpB6Lr3j+xNBO1LtTSvS1bWxUtV3ICU62zzchKCtDExRLK9fDn9uaH7J3hRjz7kA/8KEKBBIhAotg3yLAjpMNXnSGcCxEYt8D28fT6yWInZ3JbtdRUo1G7Uv0qnqUE6zT+G4UucidHrLbOrcf1S06GNCWMtR3XMzsmTtiJX5lJX8h6x5PDU44MW2k4UgLXFcSkQ/uGHqN0uUD7upHZg6QAxfI6cYa15TDNOOIVSzg5VddAkZ+Oq2BAu1kae5Lcpnq6kFJcsgLj7epMs+jjt+FSrHhP/fSEp7B1yqdGIOjHgIIIsKA99M3KgQrTtjuJ42aehWycAeNaXwO5dne3OF/pp8IPS00Ha6ccJdJibe57YRjJNd5k0fR3g==; 5:N/a2EYYlocYIMnR6yBerJKHbkkx4M40FJMGWjm9K2leWfQKLkPOyFDW/TIfSOE3hQ9DLyO/w6JFO0KjzRbsaImWLexxF7g2w6DwgWH1YIBs1zLsRal50G7n6e+8ahEiZKGD1aoVtiXQT56JTfo3+mBwdrqzo3QV5FAIqeAS6mYE=; 24:5uOf8Nsy1KQOX6zQIES8jzw2gJ3vIkXlMe6k09L9B/iTkiOZyYMv4QBUFASPDFmQ2pSjfmIyLNSPdLa1QYX/DwQSZqYsXQh3yNmSC6k9dYQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AMSPR07MB277; 7:P51kH842Vhv6ETHQhPMoPB+p/hYVahcWjAtfTSk0t1svVTYVAvCBkiWuLxlIFJaOooPuXxXqNchKHdcTivUp/aJ8sny3LMzT1BPzUflPZoHZ1O+bLcT58vP9+PeuoMV3PHPNe/8pbgAWrUA+ev4optaqv63F6G6xRn5gzQju/LF/rQCoKafGC+pdqwc22R+cWleEIcn9sSYFzXMM9tKK1ScDOS8u4LG2W9Da5lFyK9dyaNAxIITzPDFJ3qYvW3BH X-MS-Office365-Filtering-Correlation-Id: f35d8180-63ad-4077-15c2-08d5c7d5e884 X-OriginatorOrg: nokia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2018 15:39:48.4414 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f35d8180-63ad-4077-15c2-08d5c7d5e884 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AMSPR07MB277 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.1.111 Subject: [Qemu-devel] [PATCH v2] Show values and description when using "qom-list" 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: Ricardo Perez Blanco , Markus Armbruster , "open list:All patches CC here" , "Dr. David Alan Gilbert" , =?UTF-8?q?Andreas=20F=C3=A4rber?= 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 Content-Type: text/plain; charset="utf-8" For debugging purposes it is very useful to: - See the description of the field. This information is already filled in but not shown in "qom-list" command. - Display value of the field. Signed-off-by: Ricardo Perez Blanco --- hmp.c | 13 +++++++++++-- qapi/misc.json | 6 ++++-- qmp.c | 7 +++++++ qom/object.c | 8 +++----- 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/hmp.c b/hmp.c index a25c7bd9a8..ff3a024cd0 100644 --- a/hmp.c +++ b/hmp.c @@ -2490,8 +2490,17 @@ void hmp_qom_list(Monitor *mon, const QDict *qdict) while (list !=3D NULL) { ObjectPropertyInfo *value =3D list->value; =20 - monitor_printf(mon, "%s (%s)\n", - value->name, value->type); + monitor_printf(mon, "%s", value->name); + if (value->has_value) { + monitor_printf(mon, "=3D%s", value->value); + } + monitor_printf(mon, " (%s)", value->type); + if (value->has_description) { + monitor_printf(mon, "\r\t\t\t\t\t\t\t\t\t[Description: %s]= ", + value->description); + } + monitor_printf(mon, "\n"); + list =3D list->next; } qapi_free_ObjectPropertyInfoList(start); diff --git a/qapi/misc.json b/qapi/misc.json index 5636f4a149..b4bc472a37 100644 --- a/qapi/misc.json +++ b/qapi/misc.json @@ -1328,10 +1328,12 @@ # # @description: if specified, the description of the property. # -# Since: 1.2 +# @value: if specified, the value of the property. +# +# Since: 2.13 ## { 'struct': 'ObjectPropertyInfo', - 'data': { 'name': 'str', 'type': 'str', '*description': 'str' } } + 'data': { 'name': 'str', 'type': 'str', '*description': 'str', '*value':= 'str' } } =20 ## # @qom-list: diff --git a/qmp.c b/qmp.c index f72261667f..39cf656f97 100644 --- a/qmp.c +++ b/qmp.c @@ -237,6 +237,13 @@ ObjectPropertyInfoList *qmp_qom_list(const char *path,= Error **errp) =20 entry->value->name =3D g_strdup(prop->name); entry->value->type =3D g_strdup(prop->type); + if (prop->description) { + entry->value->has_description =3D true; + entry->value->description =3D g_strdup(prop->description); + } + entry->value->has_value =3D true; + entry->value->value =3D g_strdup(object_property_print(obj, + entry->value->name, true, errp)); } =20 return props; diff --git a/qom/object.c b/qom/object.c index 467795189c..4d1606e5f9 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1359,13 +1359,11 @@ char *object_property_print(Object *obj, const char= *name, bool human, v =3D string_output_visitor_new(human, &string); object_property_get(obj, v, name, &local_err); if (local_err) { - error_propagate(errp, local_err); - goto out; + string =3D g_strdup(""); + } else { + visit_complete(v, &string); } =20 - visit_complete(v, &string); - -out: visit_free(v); return string; } --=20 2.16.3