From patchwork Sun Dec 1 11:15:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 1202860 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="f/oTHgBo"; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 47QmX96Mdpz9sR8 for ; Sun, 1 Dec 2019 22:40:41 +1100 (AEDT) Received: from localhost ([::1]:50402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibNah-00014Y-6e for incoming@patchwork.ozlabs.org; Sun, 01 Dec 2019 06:40:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38264) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibNGw-0003w3-VH for qemu-devel@nongnu.org; Sun, 01 Dec 2019 06:20:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ibNGu-0002J3-S8 for qemu-devel@nongnu.org; Sun, 01 Dec 2019 06:20:14 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:48102 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ibNGs-0002Ho-S7 for qemu-devel@nongnu.org; Sun, 01 Dec 2019 06:20:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575199209; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0468PUF7tkGjn96jhD5CFLL/A1QwCQJIwdkQ4/TYVww=; b=f/oTHgBofl+Bc82rGBIQqwZHcpMKjw5EF0DV+NlTvuq8Vdsl3/qYdLrBtC0dHOpncqSjKW FOQ/eAcCslWuDjtzweYJuKS17RCRPunFZox2hLFN0SXDb2qpUVcUhlYWqXNLopUSYfgajU xurnbc/8YiYoSbehk22pnFT97eodhsw= 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-226-1_y1pa0SOYucZhp59aQw1A-1; Sun, 01 Dec 2019 06:20:06 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9E52980183C for ; Sun, 1 Dec 2019 11:20:05 +0000 (UTC) Received: from localhost (unknown [10.36.112.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 67D0D19C58; Sun, 1 Dec 2019 11:20:00 +0000 (UTC) From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= To: qemu-devel@nongnu.org Subject: [PATCH 26/26] qdev: use object_property_help() Date: Sun, 1 Dec 2019 15:15:31 +0400 Message-Id: <20191201111531.1136947-27-marcandre.lureau@redhat.com> In-Reply-To: <20191201111531.1136947-1-marcandre.lureau@redhat.com> References: <20191201111531.1136947-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: 1_y1pa0SOYucZhp59aQw1A-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 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: pbonzini@redhat.com, berrange@redhat.com, ehabkost@redhat.com, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Use the common function introduced earlier, and report default value. Signed-off-by: Marc-André Lureau --- qdev-monitor.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/qdev-monitor.c b/qdev-monitor.c index e6b112eb0a..5a09031e53 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -286,16 +286,11 @@ int qdev_device_help(QemuOpts *opts) qemu_printf("There are no options for %s.\n", driver); } for (prop = prop_list; prop; prop = prop->next) { - int len; - qemu_printf(" %s=<%s>%n", prop->value->name, prop->value->type, &len); - if (prop->value->has_description) { - if (len < 24) { - qemu_printf("%*s", 24 - len, ""); - } - qemu_printf(" - %s\n", prop->value->description); - } else { - qemu_printf("\n"); - } + g_autofree char *help = object_property_help(prop->value->name, + prop->value->type, + prop->value->default_value, + prop->value->description); + qemu_printf("%s\n", help); } qapi_free_ObjectPropertyInfoList(prop_list);