From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36864) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2kNy-0000q5-Qt for qemu-devel@nongnu.org; Fri, 26 Jul 2013 11:56:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V2kNx-0004cf-N1 for qemu-devel@nongnu.org; Fri, 26 Jul 2013 11:56:54 -0400 Received: from e06smtp17.uk.ibm.com ([195.75.94.113]:49136) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2kNx-0004cO-F2 for qemu-devel@nongnu.org; Fri, 26 Jul 2013 11:56:53 -0400 Received: from /spool/local by e06smtp17.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 26 Jul 2013 16:52:21 +0100 Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id 137962190059 for ; Fri, 26 Jul 2013 17:01:01 +0100 (BST) Received: from d06av10.portsmouth.uk.ibm.com (d06av10.portsmouth.uk.ibm.com [9.149.37.251]) by b06cxnps4075.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r6QFuclD66256952 for ; Fri, 26 Jul 2013 15:56:38 GMT Received: from d06av10.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av10.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id r6QFunQB029408 for ; Fri, 26 Jul 2013 09:56:49 -0600 Message-ID: <51F29C41.7060907@de.ibm.com> Date: Fri, 26 Jul 2013 17:56:49 +0200 From: Christian Borntraeger MIME-Version: 1.0 References: <1374853686-24079-1-git-send-email-borntraeger@de.ibm.com> <51F29BE0.10503@suse.de> In-Reply-To: <51F29BE0.10503@suse.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH] s390: fix cpustate rework fallout List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= Cc: agraf@suse.de, qemu-devel@nongnu.org On 26/07/13 17:55, Andreas Färber 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 >> ‘kvm_arch_insert_sw_breakpoint’: >> /home/cborntra/REPOS/qemu/target-s390x/kvm.c:384:5: error: passing >> argument 1 of ‘cpu_memory_rw_debug’ 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: expected >> ‘struct CPUState *’ but argument is of type ‘struct CPUS390XState *’ >> /home/cborntra/REPOS/qemu/target-s390x/kvm.c:385:9: error: passing >> argument 1 of ‘cpu_memory_rw_debug’ 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: expected >> ‘struct CPUState *’ but argument is of type ‘struct CPUS390XState *’ >> /home/cborntra/REPOS/qemu/target-s390x/kvm.c: In function >> ‘kvm_arch_remove_sw_breakpoint’: >> /home/cborntra/REPOS/qemu/target-s390x/kvm.c:398:5: error: passing >> argument 1 of ‘cpu_memory_rw_debug’ 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: expected >> ‘struct CPUState *’ but argument is of type ‘struct CPUS390XState *’ >> /home/cborntra/REPOS/qemu/target-s390x/kvm.c:402:5: error: passing >> argument 1 of ‘cpu_memory_rw_debug’ 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: expected >> ‘struct CPUState *’ but argument is of type ‘struct CPUS390XState *’ >> >> 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 before > sending the pull, must be some workflow problem then... > > Do we need the full error in the commit message? I intend to send a pull > tonight, where I would include this fix. I dont mind if you shorten it