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=-9.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 8DF1CC4727D for ; Fri, 2 Oct 2020 12:35:20 +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 17A7D207EA for ; Fri, 2 Oct 2020 12:35:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="QoB5WOoT" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 17A7D207EA 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]:43390 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kOKHO-0000xD-NJ for qemu-devel@archiver.kernel.org; Fri, 02 Oct 2020 08:35:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57390) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kOJwv-0006Vr-ED for qemu-devel@nongnu.org; Fri, 02 Oct 2020 08:14:10 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:59281) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kOJwq-0003h8-7Y for qemu-devel@nongnu.org; Fri, 02 Oct 2020 08:14:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601640843; 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=xC+9Zbv8CwpV4K4LSWFeMCh8KwxR9LCp7tAUcfvDSrM=; b=QoB5WOoT6dnZ/AMxpeIrA9nmpZfPgE1GK8pn4XyXdUecNH4OaPEQYLgB+ckt52YQMcvTTz SSg5Rt/HT7EBwOxP8Vfhcze7pKwpcKPdC5/vlWaH2MqK7EO2KmYiscljMfDivcTBQ2gO2x MGqwCkIwKXdu7oLungrBe0QGlid7cvk= 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-529-a4W1PYysNzeytbD1DZpkPg-1; Fri, 02 Oct 2020 08:14:02 -0400 X-MC-Unique: a4W1PYysNzeytbD1DZpkPg-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0B6941882FA3; Fri, 2 Oct 2020 12:14:01 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-101.ams2.redhat.com [10.36.112.101]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A83CE10013BD; Fri, 2 Oct 2020 12:14:00 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 31EA11132784; Fri, 2 Oct 2020 14:13:59 +0200 (CEST) From: Markus Armbruster To: Kevin Wolf Subject: Re: [PATCH v2 2/4] qom: Factor out helpers from user_creatable_print_help() References: <20200930124557.51835-1-kwolf@redhat.com> <20200930124557.51835-3-kwolf@redhat.com> Date: Fri, 02 Oct 2020 14:13:59 +0200 In-Reply-To: <20200930124557.51835-3-kwolf@redhat.com> (Kevin Wolf's message of "Wed, 30 Sep 2020 14:45:55 +0200") Message-ID: <87d020kepk.fsf@dusky.pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Received-SPF: pass client-ip=216.205.24.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/02 01:13:31 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: qemu-devel@nongnu.org, qemu-block@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Kevin Wolf writes: > This creates separate helper functions for printing a list of user > creatable object types and for printing a list of properties of a given > type. This allows using these parts without having a QemuOpts. Does the last sentence allude to a future patch? If yes, I suggest to phrase it as "This will allow ..." > Signed-off-by: Kevin Wolf > --- > qom/object_interfaces.c | 90 ++++++++++++++++++++++++----------------- > 1 file changed, 52 insertions(+), 38 deletions(-) > > diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c > index e8e1523960..3fd1da157e 100644 > --- a/qom/object_interfaces.c > +++ b/qom/object_interfaces.c > @@ -214,54 +214,68 @@ char *object_property_help(const char *name, const char *type, > return g_string_free(str, false); > } > > -bool user_creatable_print_help(const char *type, QemuOpts *opts) > +static void user_creatable_print_types(void) > +{ > + GSList *l, *list; > + > + 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)); > + } > + g_slist_free(list); > +} > + > +static bool user_creatable_print_type_properites(const char *type) > { > ObjectClass *klass; > + ObjectPropertyIterator iter; > + ObjectProperty *prop; > + GPtrArray *array; > + int i; > > - if (is_help_option(type)) { > - GSList *l, *list; > + klass = object_class_by_name(type); > + if (!klass) { > + return false; > + } > > - 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)); > + array = g_ptr_array_new(); > + object_class_property_iter_init(&iter, klass); > + while ((prop = object_property_iter_next(&iter))) { > + if (!prop->set) { > + continue; > } > - g_slist_free(list); > - return true; > + > + g_ptr_array_add(array, > + object_property_help(prop->name, prop->type, > + prop->defval, prop->description)); > } > + g_ptr_array_sort(array, (GCompareFunc)qemu_pstrcmp0); > + if (array->len > 0) { > + printf("%s options:\n", type); > + } else { > + printf("There are no options for %s.\n", type); > + } > + for (i = 0; i < array->len; i++) { > + printf("%s\n", (char *)array->pdata[i]); > + } > + g_ptr_array_set_free_func(array, g_free); > + g_ptr_array_free(array, true); > + return true; > +} > > - klass = object_class_by_name(type); > - if (klass && qemu_opt_has_help_opt(opts)) { > - ObjectPropertyIterator iter; > - ObjectProperty *prop; > - GPtrArray *array = g_ptr_array_new(); > - int i; > - > - object_class_property_iter_init(&iter, klass); > - while ((prop = object_property_iter_next(&iter))) { > - if (!prop->set) { > - continue; > - } > - > - g_ptr_array_add(array, > - object_property_help(prop->name, prop->type, > - prop->defval, prop->description)); > - } > - g_ptr_array_sort(array, (GCompareFunc)qemu_pstrcmp0); > - if (array->len > 0) { > - printf("%s options:\n", type); > - } else { > - printf("There are no options for %s.\n", type); > - } > - for (i = 0; i < array->len; i++) { > - printf("%s\n", (char *)array->pdata[i]); > - } > - g_ptr_array_set_free_func(array, g_free); > - g_ptr_array_free(array, true); > +bool user_creatable_print_help(const char *type, QemuOpts *opts) > +{ > + if (is_help_option(type)) { > + user_creatable_print_types(); > return true; > } > > + if (qemu_opt_has_help_opt(opts)) { > + return user_creatable_print_type_properites(type); > + } > + > return false; > } I'd make user_creatable_print_types() return true for summetry with user_creatable_print_type_properites(), but that's a matter of taste. Reviewed-by: Markus Armbruster