Message ID | 1395094341-19339-5-git-send-email-peter.maydell@linaro.org |
---|---|
State | Accepted |
Commit | ba7500852d8c3926a732892236765eee1bcaea93 |
Headers | show
Return-Path: <patchwork-forward+bncBC6Z756YVMIBBM7UTWMQKGQELSKWPZQ@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f199.google.com (mail-ob0-f199.google.com [209.85.214.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 38B4B202FA for <linaro@patches.linaro.org>; Mon, 17 Mar 2014 22:41:56 +0000 (UTC) Received: by mail-ob0-f199.google.com with SMTP id wo20sf24635858obc.2 for <linaro@patches.linaro.org>; Mon, 17 Mar 2014 15:41:55 -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:in-reply-to:references: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=v2O8Qf1vPrlTF8PB6LtNvINq+W3Inpwkm5iqgBg9kVo=; b=adnP/4p0+8xk1Kt5RzAGo8FPfsx3BxLGFzsY9xcJLMC6W0mjtMLD4pUMfrbzMKhxCY 2B+Rf2fTsto9G0V07cjVwOUCZ+HwJ7ApG6FRxv7ZDfgr8/RrcH6+ajmM2h63/vasTjO/ sxCAfSmFhZQjIxC4P8Yre3UxAtV7FOnzpOMMsHhGsSnv/0YRNa7mhUquYxPqhN072Y8C UEpUqMAcXnei8SidiNxk1s4UjSjaFAJAuXwkdWaMWzSAkhlbr0KHtWerBb7EWj12sc3o F5ikEpKamb03H6vCgWD64VM0wcp9H+p6QI9rBibMnAdC5067LoFavlai0pTk4ZzmkPyZ tViA== X-Gm-Message-State: ALoCoQnSEH8heNfXPjFeYEQuWgO9AZQZ1I0siXB8wP2V1qYTGbtYZ4LYS2n1x4jV79anvvH5ChN0 X-Received: by 10.42.146.199 with SMTP id k7mr9611341icv.24.1395096115748; Mon, 17 Mar 2014 15:41:55 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.92.85 with SMTP id a79ls1816114qge.72.gmail; Mon, 17 Mar 2014 15:41:55 -0700 (PDT) X-Received: by 10.221.29.137 with SMTP id ry9mr21834254vcb.6.1395096115610; Mon, 17 Mar 2014 15:41:55 -0700 (PDT) Received: from mail-vc0-f182.google.com (mail-vc0-f182.google.com [209.85.220.182]) by mx.google.com with ESMTPS id sh5si2161725vdc.86.2014.03.17.15.41.55 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 17 Mar 2014 15:41:55 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.182 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.182; Received: by mail-vc0-f182.google.com with SMTP id ks9so6523074vcb.13 for <patchwork-forward@linaro.org>; Mon, 17 Mar 2014 15:41:55 -0700 (PDT) X-Received: by 10.52.69.146 with SMTP id e18mr18282578vdu.15.1395096115514; Mon, 17 Mar 2014 15:41:55 -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.78.9 with SMTP id i9csp160720vck; Mon, 17 Mar 2014 15:41:55 -0700 (PDT) X-Received: by 10.140.96.23 with SMTP id j23mr26532032qge.4.1395096114894; Mon, 17 Mar 2014 15:41:54 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id lz5si4182166qcb.101.2014.03.17.15.41.54 for <patch@linaro.org> (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 17 Mar 2014 15:41:54 -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]:60631 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1WPfsy-0003uk-Fd for patch@linaro.org; Mon, 17 Mar 2014 18:19:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51264) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1WPfmM-0004ci-UJ for qemu-devel@nongnu.org; Mon, 17 Mar 2014 18:13:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1WPfmM-0007ZZ-2M for qemu-devel@nongnu.org; Mon, 17 Mar 2014 18:13:06 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:46921) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1WPfmL-0007Pr-Or for qemu-devel@nongnu.org; Mon, 17 Mar 2014 18:13:06 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from <pm215@archaic.org.uk>) id 1WPfld-00052e-CR; Mon, 17 Mar 2014 22:12:21 +0000 From: Peter Maydell <peter.maydell@linaro.org> To: Anthony Liguori <aliguori@amazon.com> Date: Mon, 17 Mar 2014 22:11:55 +0000 Message-Id: <1395094341-19339-5-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1395094341-19339-1-git-send-email-peter.maydell@linaro.org> References: <1395094341-19339-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Cc: Blue Swirl <blauwirbel@gmail.com>, =?UTF-8?q?Andreas=20F=C3=A4rber?= <andreas.faerber@web.de>, qemu-devel@nongnu.org, Aurelien Jarno <aurelien@aurel32.net> Subject: [Qemu-devel] [PULL 04/30] virt: Set reset-cbar on CPUs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: <patchwork-forward.linaro.org> List-Unsubscribe: <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe>, <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> 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-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.182 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) 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 |
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 517f2fe..2bbc931 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -390,6 +390,12 @@ static void machvirt_init(QEMUMachineInitArgs *args) if (n > 0) { object_property_set_bool(cpuobj, true, "start-powered-off", NULL); } + + if (object_property_find(cpuobj, "reset-cbar", NULL)) { + object_property_set_int(cpuobj, vbi->memmap[VIRT_CPUPERIPHS].base, + "reset-cbar", &error_abort); + } + object_property_set_bool(cpuobj, true, "realized", NULL); } fdt_add_cpu_nodes(vbi);