From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:41833) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RryTx-0002Jr-K6 for qemu-devel@nongnu.org; Mon, 30 Jan 2012 16:09:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RryTs-00059G-Pu for qemu-devel@nongnu.org; Mon, 30 Jan 2012 16:09:45 -0500 Received: from cpe-70-123-132-139.austin.res.rr.com ([70.123.132.139]:34391 helo=localhost6.localdomain6) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RryTs-00059B-K2 for qemu-devel@nongnu.org; Mon, 30 Jan 2012 16:09:40 -0500 From: Anthony Liguori Date: Mon, 30 Jan 2012 15:08:58 -0600 Message-Id: <1327957741-5842-20-git-send-email-aliguori@us.ibm.com> In-Reply-To: <1327957741-5842-1-git-send-email-aliguori@us.ibm.com> References: <1327957741-5842-1-git-send-email-aliguori@us.ibm.com> Subject: [Qemu-devel] [PATCH 20/23] info qdm: do not require a parent_bus to be set List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Andreas Faerber , Anthony Liguori , Peter Maydell Signed-off-by: Anthony Liguori --- hw/qdev-monitor.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c index 46946fe..66a6d55 100644 --- a/hw/qdev-monitor.c +++ b/hw/qdev-monitor.c @@ -165,12 +165,14 @@ int qdev_device_help(QemuOpts *opts) error_printf("%s.%s=%s\n", driver, prop->name, prop->info->legacy_name ?: prop->info->name); } - for (prop = info->bus_info->props; prop && prop->name; prop++) { - if (!prop->info->parse) { - continue; /* no way to set it, don't show */ + if (info->bus_info) { + for (prop = info->bus_info->props; prop && prop->name; prop++) { + if (!prop->info->parse) { + continue; /* no way to set it, don't show */ + } + error_printf("%s.%s=%s\n", driver, prop->name, + prop->info->legacy_name ?: prop->info->name); } - error_printf("%s.%s=%s\n", driver, prop->name, - prop->info->legacy_name ?: prop->info->name); } return 1; } -- 1.7.4.1