From patchwork Tue Feb 28 10:03:00 2017 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: 9595051 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 8D37C60429 for ; Tue, 28 Feb 2017 10:04:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 69DF128174 for ; Tue, 28 Feb 2017 10:04:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5E97028518; Tue, 28 Feb 2017 10:04:21 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, 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 EDBDC28174 for ; Tue, 28 Feb 2017 10:04:20 +0000 (UTC) Received: from localhost ([::1]:59851 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ciedo-0006wH-37 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 28 Feb 2017 05:04:20 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58917) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cied5-0006oE-Tp for qemu-devel@nongnu.org; Tue, 28 Feb 2017 05:03:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cied4-00048W-4I for qemu-devel@nongnu.org; Tue, 28 Feb 2017 05:03:35 -0500 Received: from greensocs.com ([193.104.36.180]:38408) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cied3-00048D-Oo for qemu-devel@nongnu.org; Tue, 28 Feb 2017 05:03:34 -0500 Received: from localhost (localhost [127.0.0.1]) by greensocs.com (Postfix) with ESMTP id 1730940D43F; Tue, 28 Feb 2017 11:03:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=greensocs.com; s=mail; t=1488276213; bh=aie+LvoBgdg9zPZvxUHc9Zkvkl+jOsixFd9Cwg0s9fg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=6XGncN+KIKFg4Wgf7eG0V2S8Cd7rZB4djOCbZjK8IRD5Ahf8Z3hPUyOQbfbCS2yfp P4i7A3ErefOKRU7dPqX/0awA5sfgcx35P1UfxzwvbbBC4vh8ytryZKZqXboTi5EgK7 72bE8L6aUV4Q+fYtawT5UvDgwqI0lQECcL5r2aPo= 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 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 m8fUe8ORzvHC; Tue, 28 Feb 2017 11:03:32 +0100 (CET) Received: from corsair.home (bd231-7-88-127-3-24.fbx.proxad.net [88.127.3.24]) (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 BD84A40CA6C; Tue, 28 Feb 2017 11:03:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=greensocs.com; s=mail; t=1488276212; bh=aie+LvoBgdg9zPZvxUHc9Zkvkl+jOsixFd9Cwg0s9fg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=nLIpcsPzTcT+yE+hG8xlbozexm3jRs5/xaqqcARUFX4ErGdwMjxcF9CqQez4tw5fb 7prIhs2drWWcPEE2QWEBsRqOU8aauMhVdCB1FB0KrUR58QVItJCroH8Y+dRb+c2Wle L1wsZ7Npa+T8x3fNTCuaPnwuZ8gK0vq1mXH7qnbc= From: fred.konrad@greensocs.com To: qemu-devel@nongnu.org Date: Tue, 28 Feb 2017 11:03:00 +0100 Message-Id: <1488276185-31168-6-git-send-email-fred.konrad@greensocs.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1488276185-31168-1-git-send-email-fred.konrad@greensocs.com> References: <1488276185-31168-1-git-send-email-fred.konrad@greensocs.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 193.104.36.180 Subject: [Qemu-devel] [PATCH v3 05/10] 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, mark.burton@greensocs.com, alistair.francis@xilinx.com, clg@kaod.org, fred.konrad@greensocs.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. For example: bus: main-system-bus type System dev: xlnx.zynqmp_crf, id "" gpio-out "sysbus-irq" 1 gpio-out "RST_A9" 4 qemu-clk "dbg_trace" 0.0 qemu-clk "vpll_to_lpd" 12500000.0 qemu-clk "dp_stc_ref" 0.0 qemu-clk "dpll_to_lpd" 12500000.0 qemu-clk "acpu_clk" 0.0 qemu-clk "pcie_ref" 0.0 qemu-clk "topsw_main" 0.0 qemu-clk "topsw_lsbus" 0.0 qemu-clk "dp_audio_ref" 0.0 qemu-clk "sata_ref" 0.0 qemu-clk "dp_video_ref" 1428571.4 qemu-clk "vpll_clk" 50000000.0 qemu-clk "apll_to_lpd" 12500000.0 qemu-clk "dpll_clk" 50000000.0 qemu-clk "gpu_ref" 0.0 qemu-clk "aux_refclk" 0.0 qemu-clk "video_clk" 27000000.0 qemu-clk "gdma_ref" 0.0 qemu-clk "gt_crx_ref_clk" 0.0 qemu-clk "dbg_fdp" 0.0 qemu-clk "apll_clk" 50000000.0 qemu-clk "pss_alt_ref_clk" 0.0 qemu-clk "ddr" 0.0 qemu-clk "pss_ref_clk" 50000000.0 qemu-clk "dpdma_ref" 0.0 qemu-clk "dbg_tstmp" 0.0 mmio 00000000fd1a0000/000000000000010c 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 1c57df4..8f0daa8 100644 --- a/include/qemu/qemu-clock.h +++ b/include/qemu/qemu-clock.h @@ -149,4 +149,13 @@ void qemu_clk_set_callback(QEMUClock *clk, QEMUClkRateUpdateCallback *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 549f45f..02f8255 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -30,6 +30,7 @@ #include "qemu/help_option.h" #include "sysemu/block-backend.h" #include "migration/migration.h" +#include "qemu/qemu-clock.h" /* * Aliases were a bad idea from the start. Let's keep them @@ -699,6 +700,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 8f342f6..d5dd928 100644 --- a/qemu-clock.c +++ b/qemu-clock.c @@ -27,6 +27,7 @@ #include "qemu/log.h" #include "qapi/error.h" #include "hw/qdev-core.h" +#include "monitor/monitor.h" #ifndef DEBUG_QEMU_CLOCK #define DEBUG_QEMU_CLOCK 0 @@ -134,6 +135,33 @@ QEMUClock *qemu_clk_device_get_clock(DeviceState *dev, const char *name) return QEMU_CLOCK(clk); } +struct print_opaque { + Monitor *mon; + int indent; +}; + +static int qemu_clk_print_rec(Object *obj, void *opaque) +{ + QEMUClock *clk = (QEMUClock *)(object_dynamic_cast(obj, TYPE_CLOCK)); + struct print_opaque *po = opaque; + + if (clk) { + monitor_printf(po->mon, "%*s" "qemu-clk \"%s\" %" PRIu64 "\n", + po->indent, " ", clk->name, clk->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,