From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36577) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2pCa-0003Uc-SG for qemu-devel@nongnu.org; Fri, 26 Jul 2013 17:05:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V2pCZ-0008FM-4m for qemu-devel@nongnu.org; Fri, 26 Jul 2013 17:05:28 -0400 Received: from cantor2.suse.de ([195.135.220.15]:45177 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2pCY-0008El-Ry for qemu-devel@nongnu.org; Fri, 26 Jul 2013 17:05:27 -0400 Message-ID: <51F2E490.6080600@suse.de> Date: Fri, 26 Jul 2013 23:05:20 +0200 From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= MIME-Version: 1.0 References: <1374853686-24079-1-git-send-email-borntraeger@de.ibm.com> <51F29BE0.10503@suse.de> <51F29C41.7060907@de.ibm.com> In-Reply-To: <51F29C41.7060907@de.ibm.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] s390: fix cpustate rework fallout List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Christian Borntraeger Cc: agraf@suse.de, qemu-devel@nongnu.org Am 26.07.2013 17:56, schrieb Christian Borntraeger: > On 26/07/13 17:55, Andreas F=C3=A4rber wrote: >> Am 26.07.2013 17:48, schrieb Christian Borntraeger: >>> commit f17ec444c3d39f76bcd8b71c2c05d5754bfe333e >>> exec: Change cpu_memory_rw_debug() argument to CPUState >>> >>> broke s390: >>> >>> CC s390x-softmmu/hw/block/dataplane/virtio-blk.o >>> /home/cborntra/REPOS/qemu/target-s390x/kvm.c: In function >>> =E2=80=98kvm_arch_insert_sw_breakpoint=E2=80=99: >>> /home/cborntra/REPOS/qemu/target-s390x/kvm.c:384:5: error: passing >>> argument 1 of =E2=80=98cpu_memory_rw_debug=E2=80=99 from incompatible= pointer type >>> [-Werror] >>> In file included from /home/cborntra/REPOS/qemu/target-s390x/cpu.h:40= :0, >>> from >>> /home/cborntra/REPOS/qemu/include/qemu-common.h:116, >>> from /home/cborntra/REPOS/qemu/target-s390x/kvm.c:31= : >>> /home/cborntra/REPOS/qemu/include/exec/cpu-all.h:491:5: note: expecte= d >>> =E2=80=98struct CPUState *=E2=80=99 but argument is of type =E2=80=98= struct CPUS390XState *=E2=80=99 >>> /home/cborntra/REPOS/qemu/target-s390x/kvm.c:385:9: error: passing >>> argument 1 of =E2=80=98cpu_memory_rw_debug=E2=80=99 from incompatible= pointer type >>> [-Werror] >>> In file included from /home/cborntra/REPOS/qemu/target-s390x/cpu.h:40= :0, >>> from >>> /home/cborntra/REPOS/qemu/include/qemu-common.h:116, >>> from /home/cborntra/REPOS/qemu/target-s390x/kvm.c:31= : >>> /home/cborntra/REPOS/qemu/include/exec/cpu-all.h:491:5: note: expecte= d >>> =E2=80=98struct CPUState *=E2=80=99 but argument is of type =E2=80=98= struct CPUS390XState *=E2=80=99 >>> /home/cborntra/REPOS/qemu/target-s390x/kvm.c: In function >>> =E2=80=98kvm_arch_remove_sw_breakpoint=E2=80=99: >>> /home/cborntra/REPOS/qemu/target-s390x/kvm.c:398:5: error: passing >>> argument 1 of =E2=80=98cpu_memory_rw_debug=E2=80=99 from incompatible= pointer type >>> [-Werror] >>> In file included from /home/cborntra/REPOS/qemu/target-s390x/cpu.h:40= :0, >>> from >>> /home/cborntra/REPOS/qemu/include/qemu-common.h:116, >>> from /home/cborntra/REPOS/qemu/target-s390x/kvm.c:31= : >>> /home/cborntra/REPOS/qemu/include/exec/cpu-all.h:491:5: note: expecte= d >>> =E2=80=98struct CPUState *=E2=80=99 but argument is of type =E2=80=98= struct CPUS390XState *=E2=80=99 >>> /home/cborntra/REPOS/qemu/target-s390x/kvm.c:402:5: error: passing >>> argument 1 of =E2=80=98cpu_memory_rw_debug=E2=80=99 from incompatible= pointer type >>> [-Werror] >>> In file included from /home/cborntra/REPOS/qemu/target-s390x/cpu.h:40= :0, >>> from >>> /home/cborntra/REPOS/qemu/include/qemu-common.h:116, >>> from /home/cborntra/REPOS/qemu/target-s390x/kvm.c:31= : >>> /home/cborntra/REPOS/qemu/include/exec/cpu-all.h:491:5: note: expecte= d >>> =E2=80=98struct CPUState *=E2=80=99 but argument is of type =E2=80=98= struct CPUS390XState *=E2=80=99 >>> >>> Lets fix it up. >>> >>> Signed-off-by: Christian Borntraeger >>> --- >>> target-s390x/kvm.c | 12 ++++-------- >>> 1 file changed, 4 insertions(+), 8 deletions(-) >> >> Ouch. I'm fairly certain that I tested something on ppc and s390x befo= re >> sending the pull, must be some workflow problem then... >> >> Do we need the full error in the commit message? I intend to send a pu= ll >> tonight, where I would include this fix. >=20 > I dont mind if you shorten it Thanks, applied to qom-cpu (with edit): https://github.com/afaerber/qemu-cpu/commits/qom-cpu Andreas --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=C3=BCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=C3=B6rffer; HRB 16746 AG N=C3=BC= rnberg