From patchwork Tue Feb 5 17:05:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 157516 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp5462598jaa; Tue, 5 Feb 2019 10:01:56 -0800 (PST) X-Google-Smtp-Source: AHgI3IZ0KluqRFtwcn7a/W6176zNz0NIhSznFh6iZgpxC1UtwQosa87eOMpEcE6Bqs+Pv4lOlw/r X-Received: by 2002:a81:28c3:: with SMTP id o186mr4890315ywo.309.1549389716757; Tue, 05 Feb 2019 10:01:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549389716; cv=none; d=google.com; s=arc-20160816; b=s3t/bqZAYpdP3McHv+jK3exTqfRu8JBg1gXWJxyfkHxddjLHh2Sihz68PQoErVhB9x eTER+1BJnwHswrBzUotkSaXufSo1GFj/mYj3Drelxv69Z+9mlPp48FL5GAlFL3PlOD4L ld6iG8mmvdONt77vPvu0K1aGFqAjuOARBtH7EY9HPWbCcyf1CqrYhEF7PqCjqC9cY0gI 6nIh6YL4SW+h/AayGbzDu45qD7fuyxkKIGi/fCm0EW46G+O7vLNOL0BjqT3RlM1dhqK/ cM6pwr/9UBJA7Vy1YzF67AOYhkRXNeXsurykSDBrFvDtj3TxiAnTXQSQZLyw3Nlyah8H OPdQ== 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=ZNrlTmh7hRCK4ChDppa6LEEimFwQDqMaFB6OVXrQOZs=; b=R+tUI5hiyijA2A2zMZfwGPabKpOOlEbsxTqTXKFEWI7xA8bj7YQDZhYf/ygi2QR4tb czCoWZS85CWC5r1b22kGNVLDMBG158Q2w+OBtgXPlElJGsMnqiPcS+vNTuG/v/ZK2HPP +VkHnx0EOgZ2Jho32mhaPiRsWd8ghl+TYTZp6AU4brIriOi6/YUR8Sb3xYgS03nEjWXu c2B5LIIiXTlZYlFz6NmKyYD28ROeIlbOc+W7HUOLVqfGLqWtqQTPhHHzt1DfTtsQ5fxr hAEmA0/HIpgShavJEE2Xthu9jQ4RF8sTuE9eVxAJFWoFlfE1zePR6W+OzAf9l0dUAIh0 D68A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=W3mZ24Fw; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c6si1187810ywc.204.2019.02.05.10.01.56 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 05 Feb 2019 10:01:56 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=W3mZ24Fw; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 ([127.0.0.1]:36110 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gr52i-0005dT-4k for patch@linaro.org; Tue, 05 Feb 2019 13:01:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35995) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gr4AU-0001ub-2F for qemu-devel@nongnu.org; Tue, 05 Feb 2019 12:06:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gr4AR-0000Zf-Vd for qemu-devel@nongnu.org; Tue, 05 Feb 2019 12:05:53 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:42883) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gr4AR-0000U6-N7 for qemu-devel@nongnu.org; Tue, 05 Feb 2019 12:05:51 -0500 Received: by mail-wr1-x42c.google.com with SMTP id q18so4437705wrx.9 for ; Tue, 05 Feb 2019 09:05:43 -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=ZNrlTmh7hRCK4ChDppa6LEEimFwQDqMaFB6OVXrQOZs=; b=W3mZ24Fw8PMI0oWoGJ8p5bRKeOaHLVigPi5o3KF/WyhT3IfK0BTImPHoau2/awUW+E DSrXhW4Goc1gtMiDd0IWNGuk2Iqvz1/eVtx8STUrpQoZ5qrfZLsCpaE+eQjLzC40r8FM 8X4QK2b10fRCR0UkpeVr/Ium7c7szr/IGICJczir0DOD2UtPYeaPRDMd6fpiDXaE+A60 q+zB+VnfEhPxoZ+Y39WxOXLuRvCwfvqjcUQlG7wqjnuCdH4AtxguuOYuNmAJAMfg9idq YLt2sdr9YHTP/Whh6FS5OqR8fdD2JapjhpxGqKVlM636Zmw/OfDj9u4mPrvr6GLpwcQ/ H50Q== 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=ZNrlTmh7hRCK4ChDppa6LEEimFwQDqMaFB6OVXrQOZs=; b=ndNhwG9XusFc6FLUkbrP24Scu2rMbOWtxIrhoE3dKxwyadmu1vCms3mqzI3wvbQevw 55+pWO+4G/Bx+yf1wph+vRkGm4lMQCGE207R+Umy1JqvofC1S8i8UyeV8DWU9UPgKrnP xLAJ+4fU4yiP5uyNuKJsZUCZkTkgqyITCbhtfe2/VLmG1HGmJpr/BKtc0Cv/pfkBgaL3 /CKCKcamzRQY8uiRjo/u/FOvbpNC03sGgAhXMK2BFZanbZSIcTXjaWL6ktY52xv000Tu SCe/t2JLf3U3ZVCPrQdChWDbiUbVbLcA3aCK2C+3EdfSlcWs4w1vA7+j5R/TeMo4pA9U gd0w== X-Gm-Message-State: AHQUAuZdCC+a8qoXVczhDUj0NV5hBhUB+cNcW8HkolSo6fCUZHnEuJoW f7G4OSBFixmAXJzYTsZaYdgZakgS3kn88A== X-Received: by 2002:a5d:47d1:: with SMTP id l17mr4364108wrs.319.1549386342430; Tue, 05 Feb 2019 09:05:42 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id w13sm5583164wmf.5.2019.02.05.09.05.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Feb 2019 09:05:41 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 5 Feb 2019 17:05:08 +0000 Message-Id: <20190205170510.21984-21-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190205170510.21984-1-peter.maydell@linaro.org> References: <20190205170510.21984-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42c Subject: [Qemu-devel] [PULL 20/22] hw/arm/boot: Clarify why arm_setup_firmware_boot() doesn't set env->boot_info 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The code path for booting firmware doesn't set env->boot_info. At first sight this looks odd, so add a comment saying why we don't. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Reviewed-by: Igor Mammedov Message-id: 20190131112240.8395-5-peter.maydell@linaro.org --- hw/arm/boot.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.20.1 diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 2d4f710395f..328cc6bd245 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -1182,7 +1182,8 @@ static void arm_setup_firmware_boot(ARMCPU *cpu, struct arm_boot_info *info) /* * We will start from address 0 (typically a boot ROM image) in the - * same way as hardware. + * same way as hardware. Leave env->boot_info NULL, so that + * do_cpu_reset() knows it does not need to alter the PC on reset. */ }