From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60719) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XcWNP-00005Y-By for qemu-devel@nongnu.org; Fri, 10 Oct 2014 05:20:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XcWNJ-000062-7B for qemu-devel@nongnu.org; Fri, 10 Oct 2014 05:20:43 -0400 Received: from szxga01-in.huawei.com ([119.145.14.64]:32244) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XcWNH-0008U5-Pl for qemu-devel@nongnu.org; Fri, 10 Oct 2014 05:20:37 -0400 Message-ID: <5437A4BC.3030802@huawei.com> Date: Fri, 10 Oct 2014 17:19:56 +0800 From: Gonglei MIME-Version: 1.0 References: <1412849438-12274-1-git-send-email-pbonzini@redhat.com> <1412849855-12661-16-git-send-email-pbonzini@redhat.com> <20141010104709.4a84cb4d.cornelia.huck@de.ibm.com> In-Reply-To: <20141010104709.4a84cb4d.cornelia.huck@de.ibm.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PULL 23/28] kvm: Make KVMState be the TYPE_KVM_ACCEL instance struct List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Cornelia Huck Cc: Paolo Bonzini , qemu-devel@nongnu.org, Eduardo Habkost On 2014/10/10 16:47, Cornelia Huck wrote: > On Thu, 9 Oct 2014 12:17:30 +0200 > Paolo Bonzini wrote: > >> From: Eduardo Habkost >> >> Now that we create an accel object before calling machine_init, we can >> simply use the accel object to save all KVMState data, instead of >> allocationg KVMState manually. >> >> Reviewed-by: Paolo Bonzini >> Signed-off-by: Eduardo Habkost >> Signed-off-by: Paolo Bonzini >> --- >> kvm-all.c | 13 +++++++++---- >> 1 file changed, 9 insertions(+), 4 deletions(-) > > This patch breaks compilation on s390 for me: > > CC s390x-softmmu/kvm-all.o > /home/cohuck/git/qemu/kvm-all.c:110: error: redefinition of typedef ‘KVMState’ > /home/cohuck/git/qemu/include/sysemu/kvm.h:161: error: previous declaration of ‘KVMState’ was here > > I encountered this issue too [gcc version 4.3.4 [gcc-4_3-branch revision 152973] (SUSE Linux) ]: CC m68k-softmmu/cputlb.o CC mips64-softmmu/memory.o /home/qemu/kvm-all.c:110: error: redefinition of typedef 'KVMState' /home/qemu/include/sysemu/kvm.h:161: error: previous declaration of 'KVMState' was here CC arm-softmmu/memory.o make[1]: *** [kvm-all.o] Error 1 make: *** [subdir-i386-softmmu] Error 2 make: *** Waiting for unfinished jobs.... CC mips64-softmmu/savevm.o CC or32-softmmu/cputlb.o CC microblaze-softmmu/cputlb.o CC xtensaeb-softmmu/cputlb.o CC mips64el-softmmu/savevm.o CC ppcemb-softmmu/ioport.o CC sh4-softmmu/savevm.o CC ppc-softmmu/ioport.o CC aarch64-softmmu/device_tree.o CC mips-softmmu/savevm.o CC cris-softmmu/cputlb.o CC microblazeel-softmmu/cputlb.o CC sparc-softmmu/cputlb.o CC sh4eb-softmmu/cputlb.o /home/qemu/kvm-all.c:110: error: redefinition of typedef 'KVMState' /home/qemu/include/sysemu/kvm.h:161: error: previous declaration of 'KVMState' was here Best regards, -Gonglei