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=-15.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 3F838C433DB for ; Wed, 24 Feb 2021 15:51:42 +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 A072B64E6C for ; Wed, 24 Feb 2021 15:51:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A072B64E6C 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]:48058 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEwRw-0001U0-Ho for qemu-devel@archiver.kernel.org; Wed, 24 Feb 2021 10:51:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52256) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEwPr-000864-Ij for qemu-devel@nongnu.org; Wed, 24 Feb 2021 10:49:31 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:44548) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lEwPo-0007q8-2U for qemu-devel@nongnu.org; Wed, 24 Feb 2021 10:49:31 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614181767; 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: in-reply-to:in-reply-to:references:references; bh=vUDiR/RqlmUTlvRC98wHcEmPLsO2RVGh97x/HM/FbcA=; b=aMXnHpdMTaVKmdJ31UZe0TIYb1telqi6JNwmHPzh3RgcH9RucLmaPfp41QY9b/sFU79oXM +WxMXkaw/xt8mrlWYfpAKBKICR7LPUtQhmhcGKbR+A0iW+P5wIwXb1msaS7Qm0idGd2lU8 y3mkKVl1k5qlympHNAjVW6n8RQzdGSY= 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-589-pjZPTUdaMm6w0cB-49zs6w-1; Wed, 24 Feb 2021 10:49:18 -0500 X-MC-Unique: pjZPTUdaMm6w0cB-49zs6w-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0AE67A2FB31; Wed, 24 Feb 2021 15:31:28 +0000 (UTC) Received: from work-vm (ovpn-115-71.ams2.redhat.com [10.36.115.71]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 090BE5D6A8; Wed, 24 Feb 2021 15:31:24 +0000 (UTC) Date: Wed, 24 Feb 2021 15:31:22 +0000 From: "Dr. David Alan Gilbert" To: Kevin Wolf Subject: Re: [PATCH v2 28/31] hmp: QAPIfy object_add Message-ID: References: <20210224135255.253837-1-kwolf@redhat.com> <20210224135255.253837-29-kwolf@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210224135255.253837-29-kwolf@redhat.com> User-Agent: Mutt/2.0.5 (2021-01-21) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dgilbert@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Received-SPF: pass client-ip=216.205.24.124; envelope-from=dgilbert@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no 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: lvivier@redhat.com, thuth@redhat.com, pkrempa@redhat.com, berrange@redhat.com, ehabkost@redhat.com, qemu-block@nongnu.org, libvir-list@redhat.com, armbru@redhat.com, jasowang@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com, kraxel@redhat.com, pbonzini@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" * Kevin Wolf (kwolf@redhat.com) wrote: > This switches the HMP command object_add from a QemuOpts-based parser to > user_creatable_add_from_str() which uses a keyval parser and enforces > the QAPI schema. > > Apart from being a cleanup, this makes non-scalar properties and help > accessible. In order for help to be printed to the monitor instead of > stdout, the printf() calls in the help functions are changed to > qemu_printf(). > > Signed-off-by: Kevin Wolf Reviewed-by: Dr. David Alan Gilbert > --- > monitor/hmp-cmds.c | 17 ++--------------- > qom/object_interfaces.c | 11 ++++++----- > hmp-commands.hx | 2 +- > 3 files changed, 9 insertions(+), 21 deletions(-) > > diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c > index 3c88a4faef..652cf9ff21 100644 > --- a/monitor/hmp-cmds.c > +++ b/monitor/hmp-cmds.c > @@ -1670,24 +1670,11 @@ void hmp_netdev_del(Monitor *mon, const QDict *qdict) > > void hmp_object_add(Monitor *mon, const QDict *qdict) > { > + const char *options = qdict_get_str(qdict, "object"); > Error *err = NULL; > - QemuOpts *opts; > - Object *obj = NULL; > - > - opts = qemu_opts_from_qdict(qemu_find_opts("object"), qdict, &err); > - if (err) { > - goto end; > - } > > - obj = user_creatable_add_opts(opts, &err); > - qemu_opts_del(opts); > - > -end: > + user_creatable_add_from_str(options, &err); > hmp_handle_error(mon, err); > - > - if (obj) { > - object_unref(obj); > - } > } > > void hmp_getfd(Monitor *mon, const QDict *qdict) > diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c > index 54f0dadfea..c4982dd7a0 100644 > --- a/qom/object_interfaces.c > +++ b/qom/object_interfaces.c > @@ -13,6 +13,7 @@ > #include "qemu/help_option.h" > #include "qemu/module.h" > #include "qemu/option.h" > +#include "qemu/qemu-print.h" > #include "qapi/opts-visitor.h" > #include "qemu/config-file.h" > > @@ -212,11 +213,11 @@ static void user_creatable_print_types(void) > { > GSList *l, *list; > > - printf("List of user creatable objects:\n"); > + qemu_printf("List of user creatable objects:\n"); > list = object_class_get_list_sorted(TYPE_USER_CREATABLE, false); > for (l = list; l != NULL; l = l->next) { > ObjectClass *oc = OBJECT_CLASS(l->data); > - printf(" %s\n", object_class_get_name(oc)); > + qemu_printf(" %s\n", object_class_get_name(oc)); > } > g_slist_free(list); > } > @@ -247,12 +248,12 @@ static bool user_creatable_print_type_properites(const char *type) > } > g_ptr_array_sort(array, (GCompareFunc)qemu_pstrcmp0); > if (array->len > 0) { > - printf("%s options:\n", type); > + qemu_printf("%s options:\n", type); > } else { > - printf("There are no options for %s.\n", type); > + qemu_printf("There are no options for %s.\n", type); > } > for (i = 0; i < array->len; i++) { > - printf("%s\n", (char *)array->pdata[i]); > + qemu_printf("%s\n", (char *)array->pdata[i]); > } > g_ptr_array_set_free_func(array, g_free); > g_ptr_array_free(array, true); > diff --git a/hmp-commands.hx b/hmp-commands.hx > index d4001f9c5d..6f5d9ce2fb 100644 > --- a/hmp-commands.hx > +++ b/hmp-commands.hx > @@ -1337,7 +1337,7 @@ ERST > > { > .name = "object_add", > - .args_type = "object:O", > + .args_type = "object:S", > .params = "[qom-type=]type,id=str[,prop=value][,...]", > .help = "create QOM object", > .cmd = hmp_object_add, > -- > 2.29.2 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK