From patchwork Thu Feb 3 22:45:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alon Levy X-Patchwork-Id: 81737 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9FADAB70A9 for ; Fri, 4 Feb 2011 09:53:18 +1100 (EST) Received: from localhost ([127.0.0.1]:54557 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pl835-0000G3-TN for incoming@patchwork.ozlabs.org; Thu, 03 Feb 2011 17:53:11 -0500 Received: from [140.186.70.92] (port=41351 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pl7w7-00069X-G7 for qemu-devel@nongnu.org; Thu, 03 Feb 2011 17:46:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pl7w5-000870-H4 for qemu-devel@nongnu.org; Thu, 03 Feb 2011 17:45:59 -0500 Received: from mx1.redhat.com ([209.132.183.28]:62474) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pl7w5-00086s-AO for qemu-devel@nongnu.org; Thu, 03 Feb 2011 17:45:57 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id p13MjuRp017814 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 3 Feb 2011 17:45:56 -0500 Received: from playa.redhat.com (vpn-200-5.tlv.redhat.com [10.35.200.5]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p13MjrfZ002491 for ; Thu, 3 Feb 2011 17:45:55 -0500 From: Alon Levy To: qemu-devel@nongnu.org Date: Fri, 4 Feb 2011 00:45:37 +0200 Message-Id: <1296773152-23279-2-git-send-email-alevy@redhat.com> In-Reply-To: <1296773152-23279-1-git-send-email-alevy@redhat.com> References: <1296773152-23279-1-git-send-email-alevy@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 01/16] qdev: add print_options callback X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org another callback added to PropertyInfo, for later use by PROP_TYPE_ENUM. Allows printing of runtime computed options when doing: qemu -device foo,? Signed-off-by: Alon Levy --- hw/qdev.c | 10 +++++++++- hw/qdev.h | 1 + 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index c7fec44..0b2ad3d 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -187,7 +187,15 @@ int qdev_device_help(QemuOpts *opts) if (!prop->info->parse) { continue; /* no way to set it, don't show */ } - error_printf("%s.%s=%s\n", info->name, prop->name, prop->info->name); + if (prop->info->print_options) { + char buf[256]; + int ret; + ret = prop->info->print_options(info, prop, buf, sizeof(buf) - 3); + error_printf("%s.%s=%s%s\n", info->name, prop->name, buf, + ret == sizeof(buf) - 3 ? "..." : "" ); + } else { + error_printf("%s.%s=%s\n", info->name, prop->name, prop->info->name); + } } return 1; } diff --git a/hw/qdev.h b/hw/qdev.h index 9808f85..fa3221b 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -109,6 +109,7 @@ struct PropertyInfo { enum PropertyType type; int (*parse)(DeviceState *dev, Property *prop, const char *str); int (*print)(DeviceState *dev, Property *prop, char *dest, size_t len); + int (*print_options)(DeviceInfo *info, Property *prop, char *dest, size_t len); void (*free)(DeviceState *dev, Property *prop); };