Re: [Qemu-devel] [PATCH] s390: fix cpustate rework fallout

[Andreas Färber]

Am 26.07.2013 17:56, schrieb Christian Borntraeger:
> 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 <address@hidden>
>>> ---
>>>  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

Thanks, applied to qom-cpu (with edit):
https://github.com/afaerber/qemu-cpu/commits/qom-cpu

Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg