From: "Andreas Färber" <afaerber@suse.de>
To: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: agraf@suse.de, qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH] s390: fix cpustate rework fallout
Date: Fri, 26 Jul 2013 23:05:20 +0200 [thread overview]
Message-ID: <51F2E490.6080600@suse.de> (raw)
In-Reply-To: <51F29C41.7060907@de.ibm.com>
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 <borntraeger@de.ibm.com>
>>> ---
>>> 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
prev parent reply other threads:[~2013-07-26 21:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-26 15:48 [Qemu-devel] [PATCH] s390: fix cpustate rework fallout Christian Borntraeger
2013-07-26 15:55 ` Andreas Färber
2013-07-26 15:56 ` Christian Borntraeger
2013-07-26 21:05 ` Andreas Färber [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51F2E490.6080600@suse.de \
--to=afaerber@suse.de \
--cc=agraf@suse.de \
--cc=borntraeger@de.ibm.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).