From patchwork Thu Feb 11 11:17:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 8277831 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C9B219F38B for ; Thu, 11 Feb 2016 11:18:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 30BCE201CD for ; Thu, 11 Feb 2016 11:18:02 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 6FA78202FE for ; Thu, 11 Feb 2016 11:18:01 +0000 (UTC) Received: from localhost ([::1]:48817 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aTpG4-0001rF-R5 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 11 Feb 2016 06:18:00 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43537) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aTpFv-0001ow-J5 for qemu-devel@nongnu.org; Thu, 11 Feb 2016 06:17:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aTpFu-0007P6-Ly for qemu-devel@nongnu.org; Thu, 11 Feb 2016 06:17:51 -0500 Received: from mail-vk0-x229.google.com ([2607:f8b0:400c:c05::229]:34964) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aTpFu-0007Oy-Fm for qemu-devel@nongnu.org; Thu, 11 Feb 2016 06:17:50 -0500 Received: by mail-vk0-x229.google.com with SMTP id e6so33837101vkh.2 for ; Thu, 11 Feb 2016 03:17:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :content-type:content-transfer-encoding; bh=E8fIICl1aR47+To3THB+e1lSn3CZSuWHRundz5ScTS0=; b=a49S0dyCv/wuqEaGICT0sHa1dbxmvAcazB2TWiWYPKxynRLsPE+v6puel4xUNLiKyE zWsNu6DwMkJLxvYRp6dQOSz08/VoZQZZ4zGpAgEH4aEldFGEOUjenqzBmxAAo7VuyAaG NwZjfgitMlCh7f13TH2c0L0c4VEnJDBWWDfGU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:content-type:content-transfer-encoding; bh=E8fIICl1aR47+To3THB+e1lSn3CZSuWHRundz5ScTS0=; b=jto+ljUOkDw9XhBh0DEsXzYss5+C+4CH3DF0BQGGS5rSfIXXX3cvw8k/UxCS1qRl0G A1ziioTsq4jZf3AuROtFGz0YZ8mTfc3Iw8p2ZZbcLk8noCaOSMfyvY00q59kwJs3zPmk yUBHyvVxZCIjcvk6s30V0p11TydEChuQGBE8Rwj1z9kY2kGCYX5hiFqJ4f81zdT7pXwo kUVAO6ixqcnH78LSGKJ8Y5wxFEj9SHlX5pVYjiwbnSrnN0pDurKTYsxWhuegwRfwwK7F qu4w2DjTmS9acOVTUaztXWMolyiTxS0pNtOczt8pA+KyNV6saCWs8dn6yrThjwsmBD8H vfgw== X-Gm-Message-State: AG10YOTeij6N6UjK1dLO7oCjg3S5Pl1aPxXCUUxhDRDkGhW6JmRpAkHsYDUm5cLZhx2rIS2H+SKuDndx0lXTCOMH X-Received: by 10.31.47.207 with SMTP id v198mr33914512vkv.6.1455189469819; Thu, 11 Feb 2016 03:17:49 -0800 (PST) MIME-Version: 1.0 Received: by 10.31.56.216 with HTTP; Thu, 11 Feb 2016 03:17:30 -0800 (PST) In-Reply-To: <1455043385-24250-1-git-send-email-peter.maydell@linaro.org> References: <1455043385-24250-1-git-send-email-peter.maydell@linaro.org> From: Peter Maydell Date: Thu, 11 Feb 2016 11:17:30 +0000 Message-ID: To: QEMU Developers X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400c:c05::229 Subject: Re: [Qemu-devel] [PULL 00/15] target-arm queue 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_HI,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On 9 February 2016 at 18:42, Peter Maydell wrote: > Various things in this pull, but the one I care most about is that > it includes the "enable EL3 for 64-bit CPUs" patches. > > thanks > -- PMM > > > The following changes since commit 84c0781103dcbe9b5e5433ba16fbeb55d69d6cb7: > > Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2016-02-09' into staging (2016-02-09 16:09:15 +0000) > > are available in the git repository at: > > > git://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20160209 > > for you to fetch changes up to dfe1da1c1271dff825676435ff444490da92cf4f: > > bcm2835_property: implement "get board revision" query (2016-02-09 18:27:27 +0000) > > ---------------------------------------------------------------- > target-arm queue: > * fix some missing traps for EL3 support > * enable EL3 on Cortex-A53 and Cortex-A57 > * fix syndrome IL bit for Thumb coprocessor, VFP and Neon traps > * fix mishandling of architectural watchpoints > * avoid buffer overflow in sd.c > * fix max-cpus check in virt board > * implement 'get board revision' query for BCM2835 Ran into the "one of our compilers doesn't like typedef redefinitions" issue: /home/petmay01/linaro/qemu-for-merges/include/qom/cpu.h:221: error: redefinition of typedef ‘CPUWatchpoint’ /home/petmay01/linaro/qemu-for-merges/include/qom/cpu.h:67: error: previous declaration of ‘CPUWatchpoint’ was here Will do the trivial fix and resend: thanks -- PMM diff --git a/include/qom/cpu.h b/include/qom/cpu.h index 984bc8d..ff54600 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -211,14 +211,14 @@ typedef struct CPUBreakpoint { QTAILQ_ENTRY(CPUBreakpoint) entry; } CPUBreakpoint; -typedef struct CPUWatchpoint { +struct CPUWatchpoint { vaddr vaddr; vaddr len; vaddr hitaddr; MemTxAttrs hitattrs; int flags; /* BP_* */ QTAILQ_ENTRY(CPUWatchpoint) entry; -} CPUWatchpoint; +}; struct KVMState; struct kvm_run;