From patchwork Thu Feb 25 11:10:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Gonglei (Arei)" X-Patchwork-Id: 8422581 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 87C70C0553 for ; Thu, 25 Feb 2016 11:11:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 03828202E9 for ; Thu, 25 Feb 2016 11:11:09 +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 C7BF22026F for ; Thu, 25 Feb 2016 11:11:07 +0000 (UTC) Received: from localhost ([::1]:42226 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYtp5-0007s3-5l for patchwork-qemu-devel@patchwork.kernel.org; Thu, 25 Feb 2016 06:11:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52088) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYtoy-0007ry-FT for qemu-devel@nongnu.org; Thu, 25 Feb 2016 06:11:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aYtov-00038A-Ox for qemu-devel@nongnu.org; Thu, 25 Feb 2016 06:11:00 -0500 Received: from szxga03-in.huawei.com ([119.145.14.66]:59754) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYtov-00036f-6P for qemu-devel@nongnu.org; Thu, 25 Feb 2016 06:10:57 -0500 Received: from 172.24.1.48 (EHLO SZXEMA414-HUB.china.huawei.com) ([172.24.1.48]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id BWP12831; Thu, 25 Feb 2016 19:10:23 +0800 (CST) Received: from SZXEMA503-MBS.china.huawei.com ([169.254.6.26]) by SZXEMA414-HUB.china.huawei.com ([10.82.72.73]) with mapi id 14.03.0235.001; Thu, 25 Feb 2016 19:10:17 +0800 From: "Gonglei (Arei)" To: Peter Maydell , Paolo Bonzini Thread-Topic: [Qemu-devel] [PULL 00/19] Misc changes for 2016-02-24 Thread-Index: AQHRbwdqsIRMB4cSb0KFf3LorUrPZp88DxwAgACL05A= Date: Thu, 25 Feb 2016 11:10:17 +0000 Message-ID: <33183CC9F5247A488A2544077AF19020B02E8D97@SZXEMA503-MBS.china.huawei.com> References: <1456320461-26756-1-git-send-email-pbonzini@redhat.com> In-Reply-To: Accept-Language: zh-CN, en-US Content-Language: zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.177.18.62] MIME-Version: 1.0 X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A010203.56CEE128.016D, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=169.254.6.26, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: b88159c4882166bb2d222aaefb7e2516 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 119.145.14.66 Cc: QEMU Developers Subject: Re: [Qemu-devel] [PULL 00/19] Misc changes for 2016-02-24 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=-1.9 required=5.0 tests=BAYES_00, 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 Hi, > > Subject: Re: [Qemu-devel] [PULL 00/19] Misc changes for 2016-02-24 > > On 24 February 2016 at 13:27, Paolo Bonzini wrote: > > The following changes since commit > dd5e38b19d7cb07d317e1285941d8245c01da540: > > > > Merge remote-tracking branch > 'remotes/pmaydell/tags/pull-target-arm-20160218-1' into staging (2016-02-18 > 15:20:35 +0000) > > > > are available in the git repository at: > > > > git://github.com/bonzini/qemu.git tags/for-upstream > > > > for you to fetch changes up to > 38ec9d285196af55320f986dbf477ecf0d928ad6: > > > > target-i386: fix confusion in xcr0 bit position vs. mask (2016-02-24 > 14:20:40 +0100) > > > > ---------------------------------------------------------------- > > * Asynchronous dump-guest-memory from Peter > > * improved logging with -D -daemonize from Dimitris > > * more address_space_* optimization from Gonglei > > * TCG xsave/xrstor thinko fix > > * chardev bugfix and documentation patch > > Hi. I'm afraid this failed to build with the w32 compiler that doesn't > like duplicate typedefs: > > In file included from > /home/petmay01/linaro/qemu-for-merges/include/exec/ioport.h:29, > from > /home/petmay01/linaro/qemu-for-merges/include/hw/hw.h:11, > from > /home/petmay01/linaro/qemu-for-merges/stubs/reset.c:2: > /home/petmay01/linaro/qemu-for-merges/include/exec/memory.h:156: > error: redefinition of typedef ‘RAMBlock’ > /home/petmay01/linaro/qemu-for-merges/include/qemu/typedefs.h:85: > error: previous declaration of ‘RAMBlock’ was here > Oops, sorry about this. Paolo, could you pls rebase the patch using the below diff ? Thanks! Regards, -Gonglei diff --git a/include/exec/memory.h b/include/exec/memory.h index 4e5a145..032400a 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -34,6 +34,7 @@ #include "qapi/error.h" #include "qom/object.h" #include "qemu/rcu.h" +#include "qemu/typedefs.h" #define MAX_PHYS_ADDR_SPACE_BITS 62 #define MAX_PHYS_ADDR (((hwaddr)1 << MAX_PHYS_ADDR_SPACE_BITS) - 1) @@ -156,7 +157,6 @@ struct MemoryRegionIOMMUOps { typedef struct CoalescedMemoryRange CoalescedMemoryRange; typedef struct MemoryRegionIoeventfd MemoryRegionIoeventfd; -typedef struct RAMBlock RAMBlock; struct MemoryRegion { Object parent_obj;