From patchwork Tue Jul 28 13:26:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Jones X-Patchwork-Id: 6885081 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 57C199F434 for ; Tue, 28 Jul 2015 13:27:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 88D632065B for ; Tue, 28 Jul 2015 13:27:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8CB01206D2 for ; Tue, 28 Jul 2015 13:27:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932340AbbG1N1H (ORCPT ); Tue, 28 Jul 2015 09:27:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41661 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932254AbbG1N1F (ORCPT ); Tue, 28 Jul 2015 09:27:05 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id BC14129B279 for ; Tue, 28 Jul 2015 13:27:05 +0000 (UTC) Received: from hawk.localdomain.com (dhcp-1-121.brq.redhat.com [10.34.1.121]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t6SDR3RY028080; Tue, 28 Jul 2015 09:27:04 -0400 From: Andrew Jones To: kvm@vger.kernel.org Cc: pbonzini@redhat.com Subject: [kvm-unit-tests PATCH 1/2] devicetree: add /chosen/stdout-path support Date: Tue, 28 Jul 2015 15:26:59 +0200 Message-Id: <1438090020-32388-2-git-send-email-drjones@redhat.com> In-Reply-To: <1438090020-32388-1-git-send-email-drjones@redhat.com> References: <1438090020-32388-1-git-send-email-drjones@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Andrew Jones --- lib/devicetree.c | 24 ++++++++++++++++++++++++ lib/devicetree.h | 9 +++++++++ 2 files changed, 33 insertions(+) diff --git a/lib/devicetree.c b/lib/devicetree.c index 0f9b4e9942736..93f3841daf22c 100644 --- a/lib/devicetree.c +++ b/lib/devicetree.c @@ -246,6 +246,30 @@ int dt_get_bootargs(const char **bootargs) return 0; } +int dt_get_default_console_node(void) +{ + const struct fdt_property *prop; + int node, len; + + node = fdt_path_offset(fdt, "/chosen"); + if (node < 0) + return node; + + prop = fdt_get_property(fdt, node, "stdout-path", &len); + if (!prop) { + prop = fdt_get_property(fdt, node, "linux,stdout-path", &len); + if (!prop) + return len; + } + + if (len == 0) { + /* When it's useless pretend we didn't find it. */ + return -FDT_ERR_NOTFOUND; + } + + return fdt_path_offset(fdt, prop->data); +} + int dt_init(const void *fdt_ptr) { struct dt_bus *defbus = (struct dt_bus *)&dt_default_bus; diff --git a/lib/devicetree.h b/lib/devicetree.h index 7fddc2464de8a..c8c86eeae28b6 100644 --- a/lib/devicetree.h +++ b/lib/devicetree.h @@ -215,6 +215,15 @@ extern int dt_get_reg(int fdtnode, int regidx, struct dt_reg *reg); extern int dt_get_bootargs(const char **bootargs); /* + * dt_get_default_console_node gets the node of the path stored in + * /chosen/stdout-path (or the deprecated /chosen/linux,stdout-path) + * returns + * - the node (>= 0) on success + * - a negative FDT_ERR_* value on failure + */ +extern int dt_get_default_console_node(void); + +/* * dt_get_memory_params gets the memory parameters from the /memory node(s) * storing each memory region ("address size" tuple) in consecutive entries * of @regs, up to @nr_regs