From nobody Thu Nov 6 06:16:05 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; 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 153962482768090.24057971287357; Mon, 15 Oct 2018 10:33:47 -0700 (PDT) Received: from localhost ([::1]:53413 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gC6kU-0000Wb-Eu for importer@patchew.org; Mon, 15 Oct 2018 13:33:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48110) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gC6fi-0005WB-5S for qemu-devel@nongnu.org; Mon, 15 Oct 2018 13:28:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gC6fh-0005ER-91 for qemu-devel@nongnu.org; Mon, 15 Oct 2018 13:28:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46574) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gC6fc-00059H-TH; Mon, 15 Oct 2018 13:28:45 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B81181B9B; Mon, 15 Oct 2018 17:28:41 +0000 (UTC) Received: from localhost (ovpn-204-236.brq.redhat.com [10.40.204.236]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 61C765FCBE; Mon, 15 Oct 2018 17:28:39 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Mon, 15 Oct 2018 19:28:16 +0200 Message-Id: <20181015172817.19796-5-mreitz@redhat.com> In-Reply-To: <20181015172817.19796-1-mreitz@redhat.com> References: <20181015172817.19796-1-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 15 Oct 2018 17:28:41 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 4/5] object: Make option help nicer to read 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , qemu-devel@nongnu.org, Markus Armbruster , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Just like in qemu_opts_print_help(), print the object name as a caption instead of on every single line, indent all options, and replace the '=3D' by ': '. Also, indent every object name in the list of available objects. Signed-off-by: Max Reitz --- vl.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/vl.c b/vl.c index 4e25c78bff..f9ed053eab 100644 --- a/vl.c +++ b/vl.c @@ -2707,7 +2707,7 @@ static bool object_create_initial(const char *type, Q= emuOpts *opts) list =3D object_class_get_list_sorted(TYPE_USER_CREATABLE, false); for (l =3D list; l !=3D NULL; l =3D l->next) { ObjectClass *oc =3D OBJECT_CLASS(l->data); - printf("%s\n", object_class_get_name(oc)); + printf(" %s\n", object_class_get_name(oc)); } g_slist_free(list); exit(0); @@ -2729,16 +2729,20 @@ static bool object_create_initial(const char *type,= QemuOpts *opts) } =20 str =3D g_string_new(NULL); - g_string_append_printf(str, "%s.%s=3D%s", type, - prop->name, prop->type); + g_string_append_printf(str, "%s: %s", prop->name, prop->type); if (prop->description) { g_string_append_printf(str, " - %s", prop->description); } g_ptr_array_add(array, g_string_free(str, false)); } 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 =3D 0; i < array->len; i++) { - printf("%s\n", (char *)array->pdata[i]); + printf(" %s\n", (char *)array->pdata[i]); } g_ptr_array_set_free_func(array, g_free); g_ptr_array_free(array, true); --=20 2.17.1