From patchwork Mon Jun 13 16:27:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?S09OUkFEIEZyw6lkw6lyaWM=?= X-Patchwork-Id: 9173551 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0B72A6048C for ; Mon, 13 Jun 2016 16:33:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F0E9E20410 for ; Mon, 13 Jun 2016 16:33:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E58C825EF7; Mon, 13 Jun 2016 16:33:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, FSL_HELO_HOME, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7C4A820410 for ; Mon, 13 Jun 2016 16:33:03 +0000 (UTC) Received: from localhost ([::1]:57679 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCUnO-0002Ee-1d for patchwork-qemu-devel@patchwork.kernel.org; Mon, 13 Jun 2016 12:33:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55825) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCUiR-0006R4-2Y for qemu-devel@nongnu.org; Mon, 13 Jun 2016 12:27:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bCUiM-0000sK-57 for qemu-devel@nongnu.org; Mon, 13 Jun 2016 12:27:54 -0400 Received: from greensocs.com ([193.104.36.180]:57859) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCUiL-0000s1-Q5 for qemu-devel@nongnu.org; Mon, 13 Jun 2016 12:27:50 -0400 Received: from localhost (localhost [127.0.0.1]) by greensocs.com (Postfix) with ESMTP id 3D3B41387703; Mon, 13 Jun 2016 18:27:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=greensocs.com; s=mail; t=1465835269; bh=TyAPubhXWa7g1uycWmv8aphfenVTdpRFKLjsMW9UC1g=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=crqEa9okYpYgD6j5b5lVQADRUp5QMQYduXp0rZSA5pk+JdTyqBj3585CBja4nLf7e pMkcREfKZlgFGgO3aDg1uo/JE4VP2IKL3JBNazrkpWWulaRg1rkUWEvznuXfyIKHo9 KN9yVzMwX9J8J5ikQsZbfQ5AtSPCrtnhvIISeNt8= X-Virus-Scanned: amavisd-new at greensocs.com Authentication-Results: gs-01.greensocs.com (amavisd-new); dkim=pass (1024-bit key) header.d=greensocs.com header.b=y6ccsMzd; dkim=pass (1024-bit key) header.d=greensocs.com header.b=y6ccsMzd Received: from greensocs.com ([127.0.0.1]) by localhost (gs-01.greensocs.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bclEOaGyZtgA; Mon, 13 Jun 2016 18:27:48 +0200 (CEST) Received: by greensocs.com (Postfix, from userid 998) id E0DC713E00CE; Mon, 13 Jun 2016 18:27:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=greensocs.com; s=mail; t=1465835267; bh=TyAPubhXWa7g1uycWmv8aphfenVTdpRFKLjsMW9UC1g=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=y6ccsMzdqpyrK20dAf0ItNdm87DEwVjs3du3W8lnl6tsziY3CLiISjVeAz9znBu0c QLTSbMUNL15y27gHYDTcb58nYT5RLFiml1N/nw5RlIOlWDhWNRKFXpc8we1oF4F7+f hQkgYYqsxe8gLHjqyzXxhHlEclNVefQy+zroBtBw= Received: from asus.home (localhost [IPv6:::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: fred.konrad@greensocs.com) by greensocs.com (Postfix) with ESMTPSA id 5972113A53B1; Mon, 13 Jun 2016 18:27:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=greensocs.com; s=mail; t=1465835267; bh=TyAPubhXWa7g1uycWmv8aphfenVTdpRFKLjsMW9UC1g=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=y6ccsMzdqpyrK20dAf0ItNdm87DEwVjs3du3W8lnl6tsziY3CLiISjVeAz9znBu0c QLTSbMUNL15y27gHYDTcb58nYT5RLFiml1N/nw5RlIOlWDhWNRKFXpc8we1oF4F7+f hQkgYYqsxe8gLHjqyzXxhHlEclNVefQy+zroBtBw= From: fred.konrad@greensocs.com To: qemu-devel@nongnu.org Date: Mon, 13 Jun 2016 18:27:32 +0200 Message-Id: <1465835259-21449-5-git-send-email-fred.konrad@greensocs.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1465835259-21449-1-git-send-email-fred.konrad@greensocs.com> References: <1465835259-21449-1-git-send-email-fred.konrad@greensocs.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 193.104.36.180 Subject: [Qemu-devel] [RFC PATCH 04/11] qdev-monitor: print the device's clock with info qtree 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: edgar.iglesias@xilinx.com, peter.maydell@linaro.org, fred.konrad@greensocs.com, mark.burton@greensocs.com, alistair.francis@xilinx.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: KONRAD Frederic This prints the clock attached to a DeviceState when using "info qtree" monitor command. Signed-off-by: KONRAD Frederic --- include/qemu/qemu-clock.h | 9 +++++++++ qdev-monitor.c | 2 ++ qemu-clock.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+) diff --git a/include/qemu/qemu-clock.h b/include/qemu/qemu-clock.h index 677de9a..265ec65 100644 --- a/include/qemu/qemu-clock.h +++ b/include/qemu/qemu-clock.h @@ -124,4 +124,13 @@ void qemu_clk_set_callback(qemu_clk clk, qemu_clk_on_rate_update_cb cb, void *opaque); +/** + * qemu_clk_print: + * @dev: the device for which the clock need to be printed. + * + * Print the clock information for a given device. + * + */ +void qemu_clk_print(Monitor *mon, DeviceState *dev, int indent); + #endif /* QEMU_CLOCK_H */ diff --git a/qdev-monitor.c b/qdev-monitor.c index e19617f..d6d1aa4 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -28,6 +28,7 @@ #include "qemu/config-file.h" #include "qemu/error-report.h" #include "qemu/help_option.h" +#include "qemu/qemu-clock.h" /* * Aliases were a bad idea from the start. Let's keep them @@ -684,6 +685,7 @@ static void qdev_print(Monitor *mon, DeviceState *dev, int indent) ngl->num_out); } } + qemu_clk_print(mon, dev, indent); class = object_get_class(OBJECT(dev)); do { qdev_print_props(mon, dev, DEVICE_CLASS(class)->props, indent); diff --git a/qemu-clock.c b/qemu-clock.c index 811d6a0..378a14d 100644 --- a/qemu-clock.c +++ b/qemu-clock.c @@ -24,6 +24,7 @@ #include "qemu/qemu-clock.h" #include "hw/hw.h" #include "qapi/error.h" +#include "monitor/monitor.h" /* #define DEBUG_QEMU_CLOCK */ @@ -111,6 +112,33 @@ qemu_clk qemu_clk_get_pin(DeviceState *d, const char *name) return QEMU_CLOCK(clk); } +struct print_opaque { + Monitor *mon; + int indent; +}; + +static int qemu_clk_print_rec(Object *obj, void *opaque) +{ + qemu_clk clk = (qemu_clk)(object_dynamic_cast(obj, TYPE_CLOCK)); + struct print_opaque *po = opaque; + + if (clk) { + monitor_printf(po->mon, "%*s" "qemu-clk \"%s\" %.1f\n", po->indent, + " ", clk->name, clk->out_rate); + } + + return 0; +} + +void qemu_clk_print(Monitor *mon, DeviceState *dev, int indent) +{ + struct print_opaque po; + + po.indent = indent; + po.mon = mon; + object_child_foreach(OBJECT(dev), qemu_clk_print_rec, &po); +} + static const TypeInfo qemu_clk_info = { .name = TYPE_CLOCK, .parent = TYPE_OBJECT,