From patchwork Tue May 27 11:24:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 30954 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f72.google.com (mail-oa0-f72.google.com [209.85.219.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B12C2203C3 for ; Tue, 27 May 2014 11:25:49 +0000 (UTC) Received: by mail-oa0-f72.google.com with SMTP id l6sf48035904oag.11 for ; Tue, 27 May 2014 04:25:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:cc:subject:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:errors-to:sender :x-original-sender:x-original-authentication-results:mailing-list; bh=geSKno/aBaChZU5PL3HCSnwW/OaL4ttdtsJFgpHA+uE=; b=WI+yaCT0GKd8X5n2E9GBKzYtTmhV66Xee2M0+iYQUZ7AMZljjFdiBt6LQRFMYw4rSd k4JS8p7VZ83MN/mLqShMJnNtIbvgQDV2jwPfzBbUJgd2eErKvF+cjaLNws+ntk0U3Kea 7Cf63Za/DD0sM6nuHtRNfir7dBQErfRRrPqlPaikAXMtVhPcK5Bzbn6J4x3KhtSwc5JE Y2qsS+iY4YTVgSJAM+V9ONGD/k0FmSP737ME8jvQ0SJm2VzYqhv6oii5gDcSreQtaCGE z3K7g2U+p1uGylcTArKsgf18YtWOw+4IDqzPXEdxUUYPgT9vh8qZjYcePXavg5Rr1cDw f5eA== X-Gm-Message-State: ALoCoQniSUK5Fnj1HsMLq9SER20UehbUFZzCGWF9ucYZxi2eftfruk1PPYilZXHQF7JQK22k3Mjq X-Received: by 10.182.153.68 with SMTP id ve4mr13227489obb.39.1401189949367; Tue, 27 May 2014 04:25:49 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.27.103 with SMTP id 94ls772275qgw.13.gmail; Tue, 27 May 2014 04:25:49 -0700 (PDT) X-Received: by 10.58.108.129 with SMTP id hk1mr80580veb.68.1401189949221; Tue, 27 May 2014 04:25:49 -0700 (PDT) Received: from mail-ve0-f177.google.com (mail-ve0-f177.google.com [209.85.128.177]) by mx.google.com with ESMTPS id v2si7919835vcn.15.2014.05.27.04.25.49 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 27 May 2014 04:25:49 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.177 as permitted sender) client-ip=209.85.128.177; Received: by mail-ve0-f177.google.com with SMTP id db11so10356883veb.22 for ; Tue, 27 May 2014 04:25:49 -0700 (PDT) X-Received: by 10.221.64.20 with SMTP id xg20mr22868217vcb.3.1401189949159; Tue, 27 May 2014 04:25:49 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp110841vcb; Tue, 27 May 2014 04:25:48 -0700 (PDT) X-Received: by 10.224.55.83 with SMTP id t19mr42492024qag.42.1401189948717; Tue, 27 May 2014 04:25:48 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id lc5si16318643qcb.23.2014.05.27.04.25.48 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 27 May 2014 04:25:48 -0700 (PDT) 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; Received: from localhost ([::1]:33483 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WpFVs-0003aK-3u for patch@linaro.org; Tue, 27 May 2014 07:25:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33521) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WpFVB-0003Cs-V8 for qemu-devel@nongnu.org; Tue, 27 May 2014 07:25:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WpFV6-0002Lu-3N for qemu-devel@nongnu.org; Tue, 27 May 2014 07:25:05 -0400 Received: from mail-lb0-f178.google.com ([209.85.217.178]:55621) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WpFV5-0002Lp-TY for qemu-devel@nongnu.org; Tue, 27 May 2014 07:25:00 -0400 Received: by mail-lb0-f178.google.com with SMTP id w7so4789144lbi.23 for ; Tue, 27 May 2014 04:24:58 -0700 (PDT) X-Received: by 10.152.23.233 with SMTP id p9mr23031717laf.31.1401189898561; Tue, 27 May 2014 04:24:58 -0700 (PDT) Received: from localhost.localdomain (188-178-240-98-static.dk.customer.tdc.net. [188.178.240.98]) by mx.google.com with ESMTPSA id n3sm12944301lan.3.2014.05.27.04.24.56 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 27 May 2014 04:24:57 -0700 (PDT) From: Christoffer Dall To: qemu-devel@nongnu.org Date: Tue, 27 May 2014 13:24:53 +0200 Message-Id: <1401189893-12067-1-git-send-email-christoffer.dall@linaro.org> X-Mailer: git-send-email 1.8.5.2 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.217.178 Cc: Peter Maydell , Paolo Bonzini , Alexander Graf , Christoffer Dall , Andreas Faerber Subject: [Qemu-devel] [PATCH] arm: Bugfix: Fix cpu_reset() / vcpu_init() order 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: christoffer.dall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.177 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 This fix a bug introduced by commit 50a2c6e55fa2ce5a2916a2c206bad2c6b0e06df1, but I'm not sure it is a proper fix. Acked-by: Paolo Bonzini Signed-off-by: Christoffer Dall Reviewed-by: Peter Maydell --- target-arm/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target-arm/cpu.c b/target-arm/cpu.c index 6c6f2b3..794dcb9 100644 --- a/target-arm/cpu.c +++ b/target-arm/cpu.c @@ -370,8 +370,8 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp) init_cpreg_list(cpu); - cpu_reset(cs); qemu_init_vcpu(cs); + cpu_reset(cs); acc->parent_realize(dev, errp); }