From patchwork Sun Dec 1 11:15:27 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: 1202857 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="bOrRamEc"; 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 47QmS51dkqz9sR8 for ; Sun, 1 Dec 2019 22:37:09 +1100 (AEDT) Received: from localhost ([::1]:50382 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibNXG-0005Yc-Lx for incoming@patchwork.ozlabs.org; Sun, 01 Dec 2019 06:37:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38159) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibNGC-00033c-FU for qemu-devel@nongnu.org; Sun, 01 Dec 2019 06:19:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ibNGB-0001m5-8A for qemu-devel@nongnu.org; Sun, 01 Dec 2019 06:19:28 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:25724 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 1ibNGA-0001ll-Ns for qemu-devel@nongnu.org; Sun, 01 Dec 2019 06:19:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575199166; 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=7s1I0AD6OGGP5jqLUdhtW8mOUln9CrXir22eH5j125I=; b=bOrRamEcxp05zeXF7/o3gr2PqYM+l7C+SLIxovq6u62u0WTgCZ7I6QHc6c5fbhDQcWCkW7 K3gFQiHKSAUXZqwcsjRfRg7QSaVipv+p3GIakbdupbpCLBufFQM3L1VRYTdliE7Ogudrkx BqZih/5Ym0HW6f2IecKDCE7ekQ0Ge0Y= 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-275-NUAdGicmPluNKiuyO8a-YA-1; Sun, 01 Dec 2019 06:19:25 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3BAE810054E3 for ; Sun, 1 Dec 2019 11:19:24 +0000 (UTC) Received: from localhost (unknown [10.36.112.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7080D5D9E1; Sun, 1 Dec 2019 11:19:20 +0000 (UTC) From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= To: qemu-devel@nongnu.org Subject: [PATCH 22/26] vl: print default value in object help Date: Sun, 1 Dec 2019 15:15:27 +0400 Message-Id: <20191201111531.1136947-23-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.79 on 10.5.11.14 X-MC-Unique: NUAdGicmPluNKiuyO8a-YA-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: 207.211.31.81 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" Signed-off-by: Marc-André Lureau --- qom/object_interfaces.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c index 46cd6eab5c..edb4cc4a3d 100644 --- a/qom/object_interfaces.c +++ b/qom/object_interfaces.c @@ -185,6 +185,7 @@ bool user_creatable_print_help(const char *type, QemuOpts *opts) object_class_property_iter_init(&iter, klass); while ((prop = object_property_iter_next(&iter))) { GString *str; + char *defval; if (!prop->set) { continue; @@ -192,6 +193,11 @@ bool user_creatable_print_help(const char *type, QemuOpts *opts) str = g_string_new(NULL); g_string_append_printf(str, " %s=<%s>", prop->name, prop->type); + defval = object_property_get_default(prop); + if (defval) { + g_string_append_printf(str, " (default: %s)", defval); + g_free(defval); + } if (prop->description) { if (str->len < 24) { g_string_append_printf(str, "%*s", 24 - (int)str->len, "");