From patchwork Thu Jan 26 09:47:32 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: 9538709 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 6E781601D7 for ; Thu, 26 Jan 2017 09:48:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5FB4B2811E for ; Thu, 26 Jan 2017 09:48:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 521BE2819A; Thu, 26 Jan 2017 09:48:40 +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 E4A2A2811E for ; Thu, 26 Jan 2017 09:48:38 +0000 (UTC) Received: from localhost ([::1]:37101 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cWgfV-000591-UC for patchwork-qemu-devel@patchwork.kernel.org; Thu, 26 Jan 2017 04:48:37 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39080) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cWger-00053K-Tb for qemu-devel@nongnu.org; Thu, 26 Jan 2017 04:47:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cWgen-0000m1-Jz for qemu-devel@nongnu.org; Thu, 26 Jan 2017 04:47:58 -0500 Received: from greensocs.com ([193.104.36.180]:33037) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cWgen-0000lj-7x for qemu-devel@nongnu.org; Thu, 26 Jan 2017 04:47:53 -0500 Received: from localhost (localhost [127.0.0.1]) by greensocs.com (Postfix) with ESMTP id 64D28389859; Thu, 26 Jan 2017 10:47:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=greensocs.com; s=mail; t=1485424072; bh=YyPwmX4t9gy2fECXUuBK/BZ9kFWOPiqHhNJLLiVE/Ac=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=xjyhf+T5j2S7jCShKo6f619jImI6cF7dF9+oKqaGxhqLGFxu+ZxKrdL+xwTVQOxi9 kdKcDU4PKG/VukOjfAbUnsg6rxDbDaWZUh4kKosgBrvWp6XtXUMINeEFIUFsGJKMqn 18N88h7R4LUDaBYNG0Z39x38+F7h9nad8Itu70ds= 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=cdc7mzo5; dkim=pass (1024-bit key) header.d=greensocs.com header.b=cdc7mzo5 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 4wVcq3_vHUTe; Thu, 26 Jan 2017 10:47:51 +0100 (CET) Received: by greensocs.com (Postfix, from userid 998) id C483538984F; Thu, 26 Jan 2017 10:47:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=greensocs.com; s=mail; t=1485424070; bh=YyPwmX4t9gy2fECXUuBK/BZ9kFWOPiqHhNJLLiVE/Ac=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=cdc7mzo5pMLu00apTNA6MXGDa7Q1zdEqosg+4OTb8T7v51ZSE5ebAUeb+a79mWQAf Hy6Lpg1PSOIHLIkPB5VcBYWTRa9eZHzlG5sHqvh3IfICnabkRuJNOmCxndNZa/uzsE 7xVi0JEyMXVEVg71omSU7jqDKRSQn8bZBJQy7dmI= 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 35FC7389840; Thu, 26 Jan 2017 10:47:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=greensocs.com; s=mail; t=1485424070; bh=YyPwmX4t9gy2fECXUuBK/BZ9kFWOPiqHhNJLLiVE/Ac=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=cdc7mzo5pMLu00apTNA6MXGDa7Q1zdEqosg+4OTb8T7v51ZSE5ebAUeb+a79mWQAf Hy6Lpg1PSOIHLIkPB5VcBYWTRa9eZHzlG5sHqvh3IfICnabkRuJNOmCxndNZa/uzsE 7xVi0JEyMXVEVg71omSU7jqDKRSQn8bZBJQy7dmI= From: fred.konrad@greensocs.com To: qemu-devel@nongnu.org Date: Thu, 26 Jan 2017 10:47:32 +0100 Message-Id: <1485424060-12217-3-git-send-email-fred.konrad@greensocs.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1485424060-12217-1-git-send-email-fred.konrad@greensocs.com> References: <1485424060-12217-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 V2 02/10] qemu-clk: allow to add a clock to a device 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 allows to add a clock to a DeviceState. Contrary to gpios, the clock pins are not contained in the DeviceState but with the child property so they can appears in the qom-tree. Signed-off-by: KONRAD Frederic V1 -> V2: * Rename the function use 'add' instead of 'attach' --- include/qemu/qemu-clock.h | 24 +++++++++++++++++++++++- qemu-clock.c | 23 +++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/include/qemu/qemu-clock.h b/include/qemu/qemu-clock.h index e7acd68..3e692d3 100644 --- a/include/qemu/qemu-clock.h +++ b/include/qemu/qemu-clock.h @@ -33,8 +33,30 @@ typedef struct qemu_clk { /*< private >*/ Object parent_obj; + char *name; /* name of this clock in the device. */ } *qemu_clk; -#endif /* QEMU_CLOCK_H */ +/** + * qemu_clk_device_add_clock: + * @dev: the device on which the clock needs to be added. + * @clk: the clock which needs to be added. + * @name: the name of the clock can't be NULL. + * + * Add @clk to device @dev as a clock named @name. + * + */ +void qemu_clk_device_add_clock(DeviceState *dev, qemu_clk clk, + const char *name); +/** + * qemu_clk_device_get_clock: + * @dev: the device which contains the clock. + * @name: the name of the clock. + * + * Get the clock named @name contained in the device @dev, or NULL if not found. + * + * Returns the clock named @name contained in @dev. + */ +qemu_clk qemu_clk_device_get_clock(DeviceState *dev, const char *name); +#endif /* QEMU_CLOCK_H */ diff --git a/qemu-clock.c b/qemu-clock.c index ceea98d..803deb3 100644 --- a/qemu-clock.c +++ b/qemu-clock.c @@ -25,6 +25,7 @@ #include "qemu/qemu-clock.h" #include "hw/hw.h" #include "qemu/log.h" +#include "qapi/error.h" #ifndef DEBUG_QEMU_CLOCK #define DEBUG_QEMU_CLOCK 0 @@ -36,6 +37,28 @@ } \ } while (0); +void qemu_clk_device_add_clock(DeviceState *dev, qemu_clk clk, + const char *name) +{ + assert(name); + assert(!clk->name); + object_property_add_child(OBJECT(dev), name, OBJECT(clk), &error_abort); + clk->name = g_strdup(name); +} + +qemu_clk qemu_clk_device_get_clock(DeviceState *dev, const char *name) +{ + gchar *path = NULL; + Object *clk; + bool ambiguous; + + path = g_strdup_printf("%s/%s", object_get_canonical_path(OBJECT(dev)), + name); + clk = object_resolve_path(path, &ambiguous); + g_free(path); + return QEMU_CLOCK(clk); +} + static const TypeInfo qemu_clk_info = { .name = TYPE_CLOCK, .parent = TYPE_OBJECT,