Re: [Qemu-devel] [PATCH 06/15] s390: Add channel I/O instructions.

[Alexander Graf]

On 01/28/2013 10:59 AM, Cornelia Huck wrote:
> On Fri, 25 Jan 2013 20:28:31 +0100
> Alexander Graf<address@hidden>  wrote:
>
> > However, I do agree that this duplicates logic. Cornelia, mind to instead call 
> > our map helper in css_do_tpi?
> Well, ioinst_handle_tpi() looks like the better place to do this.
>
> Can you put this into the series, or should I re-send?

It still breaks for 32-bit targets. Could you please replace the set_bit 
call by normal bit shift operations?


Alex

<afaerber_>   CC    s390x-softmmu/hw/s390x/virtio-ccw.o
<afaerber_>   CC    s390x-softmmu/target-s390x/translate.o
<afaerber_>   CC    s390x-softmmu/target-s390x/helper.o
<afaerber_> /home/andreas/QEMU/qemu-s390/hw/s390x/virtio-ccw.c: In 
function 'virtio_ccw_notify':
<afaerber_> /home/andreas/QEMU/qemu-s390/hw/s390x/virtio-ccw.c:665:9: 
warning: passing argument 2 of 'set_bit' from incompatible pointer type 
[enabled by default]
<afaerber_> In file included from 
/home/andreas/QEMU/qemu-s390/hw/s390x/virtio-ccw.c:22:0:
<afaerber_> /home/andreas/QEMU/qemu-s390/include/qemu/bitops.h:117:20: 
note: expected 'long unsigned int *' but argument is of type 'uint64_t *'
* rastal (address@hidden) has joined #qemu
<afaerber_> /home/andreas/QEMU/qemu-s390/hw/s390x/virtio-ccw.c:670:9: 
warning: passing argument 2 of 'set_bit' from incompatible pointer type 
[enabled by default]
<afaerber_> In file included from 
/home/andreas/QEMU/qemu-s390/hw/s390x/virtio-ccw.c:22:0:
<mjt> whee
<afaerber_> /home/andreas/QEMU/qemu-s390/include/qemu/bitops.h:117:20: 
note: expected 'long unsigned int *' but argument is of type 'uint64_t *'
<afaerber_> agraf: ^

    if (vector < VIRTIO_PCI_QUEUE_MAX) {
        indicators = ldq_phys(dev->indicators);
        set_bit(vector, &indicators);
^^

        stq_phys(dev->indicators, indicators);
    } else {
        vector = 0;
        indicators = ldq_phys(dev->indicators2);
        set_bit(vector, &indicators);
        stq_phys(dev->indicators2, indicators);
    }