Message ID | 20181214144214.1260-15-peter.maydell@linaro.org |
---|---|
State | Accepted |
Commit | da885fe1ee8b4589047484bd7fa05a4905b52b17 |
Headers | show
Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp2164145ljp; Fri, 14 Dec 2018 06:54:38 -0800 (PST) X-Google-Smtp-Source: AFSGD/X8mbFTl9G9icTrQntOfFsepOFNCrv7l3ET3nJsORh4Ibo5Sk6E14gbkF6EU9lIuJzcbsh6 X-Received: by 2002:ac8:b0e:: with SMTP id e14mr3170831qti.336.1544799278700; Fri, 14 Dec 2018 06:54:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544799278; cv=none; d=google.com; s=arc-20160816; b=0QjKoJlGhVpoYgQGGIbcL8ajOvvaaYodLgqnXwrTqzQpFiPwseJ3U71sijNKuypZHe aJwAsM8C8FoHsR+lcKGofvu8oLo/rB7EMXNGk0cd715c3G5VYXoKDZuEEWfk6IV3qj8c HxBN9jLerG3di4FJbiQUGzXWlIZWBznnaVOslZptFnxd23+2Yp4XpMhSMmxXY2xIKrD+ 0aoxB/jQWNG/MlWaJEKPiPKeTiblH6v6M6qUVLLLh+i866tXnCNykS7vm4MBYjKGCArJ tT991B7Sc2mEXveAUOs00eiEcmiGJqV4cpgKYeUb+HWi69pUhvNSEH8Z3i5L5tICzWqu md1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=BczOP9zqmfzqTxFzarSwCSMPsknT71/oxF9WY4Jkbs0=; b=cJiPTP9yx4QApBpAw43IVOTQFhwzVrwFAScES74P9WAnmhAjQd9X2FLfPBDK4SHpbS 19lGUyHMwGkfLyfbR4Nj8Tqp+ydeWOyBDEEC5grNMkAZebePWepRmkhpM3U+l1Kpa4La XfXRpqsHk5Z8eWxuy75b7MMnTuUAcyKLvlDVdl5ybLFZih+ZEVe2IFulVbP+i2qxe2/1 qWhf2MHDpioElLPmLKxWCRaO0Mjga/YSo09T5fvNsOghq/6aGCfztKu2WEJ7tT78vb7z JSENLL3f3o/ysReoPxS7TLGGEGXAiu7qxkR84a+xx6OR8OxpBhQuICLk6XIWWGFM/dJE kF6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=kgisGM5R; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: <qemu-devel-bounces+patch=linaro.org@nongnu.org> Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id l91si1469424qva.115.2018.12.14.06.54.38 for <patch@linaro.org> (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 14 Dec 2018 06:54:38 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=kgisGM5R; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33931 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1gXorO-0001xO-2Z for patch@linaro.org; Fri, 14 Dec 2018 09:54:38 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38407) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <peter.maydell@linaro.org>) id 1gXofm-00008J-1i for qemu-devel@nongnu.org; Fri, 14 Dec 2018 09:42:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <peter.maydell@linaro.org>) id 1gXofj-0004Rh-C1 for qemu-devel@nongnu.org; Fri, 14 Dec 2018 09:42:37 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:51898) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <peter.maydell@linaro.org>) id 1gXofj-0004RE-0L for qemu-devel@nongnu.org; Fri, 14 Dec 2018 09:42:35 -0500 Received: by mail-wm1-x32e.google.com with SMTP id s14so5926824wmh.1 for <qemu-devel@nongnu.org>; Fri, 14 Dec 2018 06:42:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=BczOP9zqmfzqTxFzarSwCSMPsknT71/oxF9WY4Jkbs0=; b=kgisGM5RpvcmtMD4VtaITxymAISbfJW/LnOIAUACk5a0/tZivl4E/PE3rCW4pQU2cc wnNcHSSvUKBlzv2jRA4pnuU52n/czCi9EsphZcIF84K1Dchcl9pYlyiPhMUqQmVxpLuY 2AQgiZmt7+CcBoKKu3yhTbV6P78DzZ39HG1TQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BczOP9zqmfzqTxFzarSwCSMPsknT71/oxF9WY4Jkbs0=; b=llKoPFHf6Z+RjCMEzv41DJFzSDRTuh2YnbKlZ7l8tFh7Vlxln4eWiYhJc/OsWvD9Pw HDH46IGtK+77XzOnpGX6/aZNDsJbnUOHzYRxEw0eXnowA+mYwXiwwQAtvVeF6Tu/HYku usrC5bhv3ytsOb1WujEbxiQKuwUf0NRI1eR+EXkY6dx+d/p0HsueAzQ6MzKo+N4VnkMy +j+wL7MKAzigFxJf0wIwSlqy8M9vj7X3rV3Qw7a/D51kXeGR4e03yPNaoqcWh5f5vwF0 s2mQix2D0AN+0mbjxLgmwFJ0cFN1kO7q1Mr/QiW5owjyW9Mm+0esL+vllO0VNLICVWis Edow== X-Gm-Message-State: AA+aEWZ8WehrhszfT71EVg7JSqXRpqRK+OHKJCs/LbOyyUbr1nSFyMG5 SSARWJAgSKXATFQh8DNueGuZJ67h/Eo= X-Received: by 2002:a1c:8851:: with SMTP id k78mr3511180wmd.51.1544798553662; Fri, 14 Dec 2018 06:42:33 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id m6sm3263204wrv.24.2018.12.14.06.42.32 for <qemu-devel@nongnu.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 14 Dec 2018 06:42:32 -0800 (PST) From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Date: Fri, 14 Dec 2018 14:42:06 +0000 Message-Id: <20181214144214.1260-15-peter.maydell@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181214144214.1260-1-peter.maydell@linaro.org> References: <20181214144214.1260-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32e Subject: [Qemu-devel] [PULL 14/22] device_tree.c: Don't use load_image() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org> |
Series |
misc queue
|
expand
|
diff --git a/device_tree.c b/device_tree.c index 6d9c9726f66..296278e12ae 100644 --- a/device_tree.c +++ b/device_tree.c @@ -91,7 +91,7 @@ void *load_device_tree(const char *filename_path, int *sizep) /* First allocate space in qemu for device tree */ fdt = g_malloc0(dt_size); - dt_file_load_size = load_image(filename_path, fdt); + dt_file_load_size = load_image_size(filename_path, fdt, dt_size); if (dt_file_load_size < 0) { error_report("Unable to open device tree file '%s'", filename_path);