From patchwork Wed Mar 30 16:25:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 8699791 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 ED5359F44D for ; Wed, 30 Mar 2016 16:26:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 478992038A for ; Wed, 30 Mar 2016 16:26:19 +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 8ACB2201F5 for ; Wed, 30 Mar 2016 16:26:18 +0000 (UTC) Received: from localhost ([::1]:55698 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alIwi-0003Ec-Q3 for patchwork-qemu-devel@patchwork.kernel.org; Wed, 30 Mar 2016 12:26:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58243) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alIwb-0003EM-2G for qemu-devel@nongnu.org; Wed, 30 Mar 2016 12:26:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1alIwa-0007b0-3r for qemu-devel@nongnu.org; Wed, 30 Mar 2016 12:26:08 -0400 Received: from mail-vk0-x229.google.com ([2607:f8b0:400c:c05::229]:35437) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alIwZ-0007at-UY for qemu-devel@nongnu.org; Wed, 30 Mar 2016 12:26:08 -0400 Received: by mail-vk0-x229.google.com with SMTP id e6so68025103vkh.2 for ; Wed, 30 Mar 2016 09:26:07 -0700 (PDT) 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; bh=3DXL6X8LeJ+Fv1KEc/y7wybdnAlJ650lbUj634eg6KQ=; b=Abhft9vWWI6J87NMcDmVyOmESH2MmA4aPbKRKfAOE3KN9IleeqELK8VUSDcZBSAN1u AHMS527kn10alZ1t3Kwxv/PUk892NuMsXwyCq72aHYsLcnLXd01OOIFHj47EIXnO/Quy Nr6c1m3U9+j3ClkwIbVacvCYASAQNjW2IrlVo= 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; bh=3DXL6X8LeJ+Fv1KEc/y7wybdnAlJ650lbUj634eg6KQ=; b=DCkTmNikab8xjtLcjMPP0P5C5kdQJ9YT4gcGvlOxHjgCMlIov5f4kKv591u21lYyQu fSIsLaAsUrUlVl49DIhSfAT6o5Mq7PQE7zF4b/yz4DJwkQ5CmiR6wH8skoE0gjLRgm8y 3wPFPFVUbkhc6uK/HvFBHsv6aqcKLIswTO3kjYH9QAqvxJprfutVZlIGbo8euZVEVWX+ Ak7IVrwdffPwoymxvmPuA/3uLpL2QBJ/qAX9NLJi6+uu86n99lIxfdohcdmsStuKzX4u mkn2G9UOK7hG7WfG4sbMFxREpp323Byps7u0CkGS38Uvok/tUhtAfjxRxx1yg4kSOuWu pe3w== X-Gm-Message-State: AD7BkJLou4BbtFL3Jj9CnrgyBd4szeO0vT94npp0FJ/ty5np8o3hSs9LQGKJf1jfw9cze55os4wZvcQz+j5ceOvS X-Received: by 10.159.38.3 with SMTP id 3mr2130831uag.107.1459355167098; Wed, 30 Mar 2016 09:26:07 -0700 (PDT) MIME-Version: 1.0 Received: by 10.31.216.1 with HTTP; Wed, 30 Mar 2016 09:25:47 -0700 (PDT) In-Reply-To: <1459349869-25448-1-git-send-email-peter.maydell@linaro.org> References: <1459349869-25448-1-git-send-email-peter.maydell@linaro.org> From: Peter Maydell Date: Wed, 30 Mar 2016 17:25:47 +0100 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/17] 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 30 March 2016 at 15:57, Peter Maydell wrote: > > Last lot of target-arm patches just sneaking under the wire: > * m25p80 (should be safe enough since not really used by anything) > * virt power key bugfix > * query-gic-capabilities QMP command > > thanks > -- PMM > > The following changes since commit b9c27e7ae6fb1387eafe858d8378ff14cd1c5b89: > > Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (2016-03-30 13:43:05 +0100) > > are available in the git repository at: > > > git://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20160330 > > for you to fetch changes up to eefb90314f80c421899f8c42e59df7b80a27c93b: > > arm: implement query-gic-capabilities (2016-03-30 15:48:27 +0100) > > ---------------------------------------------------------------- > target-arm queue: > * virt: fix the virtual power button by adding a modelled > "key press for 100ms" device > * various improvements to m25p80 flash devices > * implement new QMP query-gic-capability command to let the > management layer know what versions of GIC we support Whoops, build failure for the linux-user targets. Fixup patch: thanks -- PMM diff --git a/target-arm/Makefile.objs b/target-arm/Makefile.objs index 334074c..82cbe6b 100644 --- a/target-arm/Makefile.objs +++ b/target-arm/Makefile.objs @@ -1,5 +1,5 @@ obj-y += arm-semi.o -obj-$(CONFIG_SOFTMMU) += machine.o psci.o arch_dump.o +obj-$(CONFIG_SOFTMMU) += machine.o psci.o arch_dump.o monitor.o obj-$(CONFIG_KVM) += kvm.o obj-$(call land,$(CONFIG_KVM),$(call lnot,$(TARGET_AARCH64))) += kvm32.o obj-$(call land,$(CONFIG_KVM),$(TARGET_AARCH64)) += kvm64.o @@ -8,4 +8,4 @@ obj-y += translate.o op_helper.o helper.o cpu.o obj-y += neon_helper.o iwmmxt_helper.o obj-y += gdbstub.o obj-$(TARGET_AARCH64) += cpu64.o translate-a64.o helper-a64.o gdbstub64.o -obj-y += crypto_helper.o monitor.o +obj-y += crypto_helper.o