From owner-svn-src-all@freebsd.org Thu Jul 19 23:49:11 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 85B791051022; Thu, 19 Jul 2018 23:49:11 +0000 (UTC) (envelope-from chmeeedalf@gmail.com) Received: from mail-lf1-f49.google.com (mail-lf1-f49.google.com [209.85.167.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E69CE823FE; Thu, 19 Jul 2018 23:49:10 +0000 (UTC) (envelope-from chmeeedalf@gmail.com) Received: by mail-lf1-f49.google.com with SMTP id a4-v6so545523lff.5; Thu, 19 Jul 2018 16:49:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=3lVsAqxlOsrWWvPbIoyplYOpoYnk9J8pHqJt9mV+OoE=; b=RxiTt60VnHfb1XptOtBMqdQgDEEqAijXQyYwPgI9bJpRY/1wPWlNfAsGeu/ChHGcit rpkdp2m9DKLIeccVYl6FnGplX83NV2dUZsEauI0DUIBOrfnSWl8KOkWtjr6lKJOBVp8f 7DZtIX/LHu7mXVaYL4jTt2yku4g/yC1WndXsO0GjZYFgczG88kAo6jCEthQCC9F1afio eXEpGQRfLPYeAWeZzXaSalsE/kTPhKJeMqYXh8mq2Dwe2X4HlCTKDAXsfojMO9FJj+U4 DRHgm2BlmVTrunyzaFRB3Ft9gge7Iy8ybmi2W57yGyoedWFhIuGjt6j6/SV9B7VoakYg WRtg== X-Gm-Message-State: AOUpUlGv/hhFQOmxfkEz4NdKxt9vkbWmed9xr+3U6GoKwlBrm+Bj0kg+ wbT6hczeemjW+Gds0oulRw2xEyyhtgUIHtloBkCLckUI X-Google-Smtp-Source: AAOMgpduHXenzwydJrCnjkfVtHrhLkk/WYTKbd19uEJ3uCzWqWjmuo0Hsy2Famjs+zdXXldoHaQHuY+WnrTexJjrK0Y= X-Received: by 2002:a19:ebd7:: with SMTP id f84-v6mr7326569lfk.18.1532033102488; Thu, 19 Jul 2018 13:45:02 -0700 (PDT) MIME-Version: 1.0 References: <201807192022.w6JKMkE6044331@repo.freebsd.org> <72e23592-9ff2-b373-f8cc-755c358989f5@freebsd.org> In-Reply-To: <72e23592-9ff2-b373-f8cc-755c358989f5@freebsd.org> From: Justin Hibbits Date: Thu, 19 Jul 2018 15:44:49 -0500 Message-ID: Subject: Re: svn commit: r336514 - head/sys/dev/vt/hw/ofwfb To: Nathan Whitehorn Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jul 2018 23:49:11 -0000 You're right. I'm an idiot. I compiled but didn't try booting. Fixing it after I fix the build. - Justin On Thu, Jul 19, 2018 at 3:37 PM Nathan Whitehorn wrote: > > Isn't stdout-path supposed to contain a string rather than an ihandle? > This code assumes it is an ihandle (or xref phandle), which I think is > wrong. > -Nathan > > On 07/19/18 13:22, Justin Hibbits wrote: > > Author: jhibbits > > Date: Thu Jul 19 20:22:46 2018 > > New Revision: 336514 > > URL: https://svnweb.freebsd.org/changeset/base/336514 > > > > Log: > > ofwfb: Check for /chosen/stdout-path in addition to /chosen/stdout > > > > Some platforms use /chosen/stdout-path as the property containing the path to > > the stdout node, not /chosen/stdout. > > > > Modified: > > head/sys/dev/vt/hw/ofwfb/ofwfb.c > > > > Modified: head/sys/dev/vt/hw/ofwfb/ofwfb.c > > ============================================================================== > > --- head/sys/dev/vt/hw/ofwfb/ofwfb.c Thu Jul 19 20:20:43 2018 (r336513) > > +++ head/sys/dev/vt/hw/ofwfb/ofwfb.c Thu Jul 19 20:22:46 2018 (r336514) > > @@ -102,6 +102,10 @@ ofwfb_probe(struct vt_device *vd) > > if (OF_getprop(chosen, "stdout", &stdout, sizeof(stdout)) == > > sizeof(stdout)) > > node = OF_instance_to_package(stdout); > > + if (node == -1) > > + if (OF_getprop(chosen, "stdout-path", &stdout, sizeof(stdout)) == > > + sizeof(stdout)) > > + node = OF_instance_to_package(stdout); > > if (node == -1) { > > /* > > * The "/chosen/stdout" does not exist try > > >