From patchwork Fri Sep 5 15:15:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 386395 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 ozlabs.org (Postfix) with ESMTPS id BF33A1400B6 for ; Sat, 6 Sep 2014 01:16:16 +1000 (EST) Received: from localhost ([::1]:58411 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPvFG-0004ZU-51 for incoming@patchwork.ozlabs.org; Fri, 05 Sep 2014 11:16:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60066) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPvEh-0003ml-0f for qemu-devel@nongnu.org; Fri, 05 Sep 2014 11:15:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XPvEZ-0002ju-UC for qemu-devel@nongnu.org; Fri, 05 Sep 2014 11:15:38 -0400 Received: from mail-wi0-f182.google.com ([209.85.212.182]:36647) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPvEZ-0002jg-O2 for qemu-devel@nongnu.org; Fri, 05 Sep 2014 11:15:31 -0400 Received: by mail-wi0-f182.google.com with SMTP id z2so3146563wiv.3 for ; Fri, 05 Sep 2014 08:15:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jqWL4LFqVnJNZpH8G8BNi8wLFLBN+YOjWTwJ7Es92WU=; b=kWvuaP62eHQIdcXIAgSG6usEbxKi1O/iZW2wSuHGT9lFOftDWole2HcCAoUQfpWvaq 85YLl1stg06GAQvkE1wkhCo9rSKlPTqESYfcFRSCE9gStcnOoTb2bfPjbZ2k3yo0G7D+ VpAdnWYuWmQXW8/+8KOLi393plZdN5Zgd9Ynx+mbOmhHBPF20L3xZRgHIrVRbk/xRVGC u/uIig9XUCmVkhReEK399taBHGChhfvl6EEm2SEwwPAVoBABhtMAlVCVG0hyjqR/+Gml RQIliQPNsf5bFsJQNxAD+kwjYNh5JbidJowWW5LIeYSirmOxMLmAPMNjVyt8MD1RVW5A 4yUg== X-Gm-Message-State: ALoCoQkpT4AYjgegl+6CryM7ARj/3ZVVh9YlqjphnrCiho8c0elueJ+CSehSolre/HnERVDpVShh X-Received: by 10.180.95.169 with SMTP id dl9mr4559041wib.51.1409930130332; Fri, 05 Sep 2014 08:15:30 -0700 (PDT) Received: from ards-macbook-pro.local (cag06-7-83-153-85-71.fbx.proxad.net. [83.153.85.71]) by mx.google.com with ESMTPSA id wx3sm1734308wjc.19.2014.09.05.08.15.29 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 05 Sep 2014 08:15:29 -0700 (PDT) From: Ard Biesheuvel To: peter.maydell@linaro.org, qemu-devel@nongnu.org Date: Fri, 5 Sep 2014 17:15:24 +0200 Message-Id: <1409930126-28449-5-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1409930126-28449-1-git-send-email-ard.biesheuvel@linaro.org> References: <1409930126-28449-1-git-send-email-ard.biesheuvel@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.212.182 Cc: fu.wei@linaro.org, christoffer.dall@linaro.org, Ard Biesheuvel Subject: [Qemu-devel] [PATCH 4/6] hw/arm/boot: register cpu reset handlers if using -bios X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org When booting with -bios or -pflash rather than -kernel, we need to make sure reset handlers are registered. Signed-off-by: Ard Biesheuvel --- hw/arm/boot.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 8f5649a250fd..0cfc11d42962 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -473,6 +473,10 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) } } + for (; cs; cs = CPU_NEXT(cs)) { + qemu_register_reset(do_cpu_reset, ARM_CPU(cs)); + } + /* If no kernel specified, do nothing; we will start from address 0 * (typically a boot ROM image) in the same way as hardware. */