Re: [PATCH v2 2/5] memory: Add IOMMUTLBEvent

[Eugenio Perez Martin]

On Fri, Oct 30, 2020 at 11:50 AM Michael S. Tsirkin <mst@redhat.com> wrote:
>
> On Mon, Oct 19, 2020 at 12:43:29PM +0200, Eugenio Pérez wrote:
> > This way we can tell between regular IOMMUTLBEntry (entry of IOMMU
> > hardware) and notifications.
> >
> > In the notifications, we set explicitly if it is a MAPs or an UNMAP,
> > instead of trusting in entry permissions to differentiate them.
> >
> > Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
> > Reviewed-by: Peter Xu <peterx@redhat.com>
> > Reviewed-by: Juan Quintela <quintela@redhat.com>
>
> Breaks s390:
>
> FAILED: libqemu-s390x-softmmu.fa.p/hw_s390x_s390-pci-inst.c.o
> cc -Ilibqemu-s390x-softmmu.fa.p -I. -I../qemu -Itarget/s390x 
> -I../qemu/target/s390x -Iqapi -Itrace -Iui -Iui/shader -I/usr/include/spice-1 
> -I/usr/include/spice-server -I/usr/include/cacard -I/usr/include/glib-2.0 
> -I/usr/lib64/glib-2.0/include -I/usr/include/nss3 -I/usr/include/nspr4 
> -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/pixman-1 
> -I/usr/include/capstone -fdiagnostics-color=auto -pipe -Wall -Winvalid-pch 
> -Werror -std=gnu99 -O2 -g -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -m64 -mcx16 
> -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes 
> -Wredundant-decls -Wundef -Wwrite-strings -Wmissing-prototypes 
> -fno-strict-aliasing -fno-common -fwrapv -Wold-style-declaration 
> -Wold-style-definition -Wtype-limits -Wformat-security -Wformat-y2k 
> -Winit-self -Wignored-qualifiers -Wempty-body -Wnested-externs -Wendif-labels 
> -Wexpansion-to-defined -Wno-missing-include-dirs -Wno-shift-negative-value 
> -Wno-psabi -fstack-protector-strong -isystem /scm/qemu/linux-headers -isystem 
> linux-headers -iquote /scm/qemu/tcg/i386 -iquote . -iquote /scm/qemu -iquote 
> /scm/qemu/accel/tcg -iquote /scm/qemu/include -iquote /scm/qemu/disas/libvixl 
> -pthread -fPIC -isystem../qemu/linux-headers -isystemlinux-headers 
> -DNEED_CPU_H '-DCONFIG_TARGET="s390x-softmmu-config-target.h"' 
> '-DCONFIG_DEVICES="s390x-softmmu-config-devices.h"' -MD -MQ 
> libqemu-s390x-softmmu.fa.p/hw_s390x_s390-pci-inst.c.o -MF 
> libqemu-s390x-softmmu.fa.p/hw_s390x_s390-pci-inst.c.o.d -o 
> libqemu-s390x-softmmu.fa.p/hw_s390x_s390-pci-inst.c.o -c 
> ../qemu/hw/s390x/s390-pci-inst.c
> ../qemu/hw/s390x/s390-pci-inst.c: In function ‘s390_pci_update_iotlb’:
> ../qemu/hw/s390x/s390-pci-inst.c:599:61: error: incompatible type for 
> argument 3 of ‘memory_region_notify_iommu’
>   599 |             memory_region_notify_iommu(&iommu->iommu_mr, 0, notify);
>       |                                                             ^~~~~~
>       |                                                             |
>       |                                                             
> IOMMUTLBEntry
> In file included from /scm/qemu/include/exec/cpu-all.h:23,
>                  from ../qemu/target/s390x/cpu.h:846,
>                  from ../qemu/hw/s390x/s390-pci-inst.c:15:
> /scm/qemu/include/exec/memory.h:1324:47: note: expected ‘IOMMUTLBEvent’ but 
> argument is of type ‘IOMMUTLBEntry’
>  1324 |                                 IOMMUTLBEvent event);
>       |                                 ~~~~~~~~~~~~~~^~~~~
> ../qemu/hw/s390x/s390-pci-inst.c:611:53: error: incompatible type for 
> argument 3 of ‘memory_region_notify_iommu’
>   611 |     memory_region_notify_iommu(&iommu->iommu_mr, 0, notify);
>       |                                                     ^~~~~~
>       |                                                     |
>       |                                                     IOMMUTLBEntry
> In file included from /scm/qemu/include/exec/cpu-all.h:23,
>                  from ../qemu/target/s390x/cpu.h:846,
>                  from ../qemu/hw/s390x/s390-pci-inst.c:15:
> /scm/qemu/include/exec/memory.h:1324:47: note: expected ‘IOMMUTLBEvent’ but 
> argument is of type ‘IOMMUTLBEntry’
>  1324 |                                 IOMMUTLBEvent event);
>       |                                 ~~~~~~~~~~~~~~^~~~~
>

Sorry, will compile every target next time.

Sending v3 with s390x changes.

Thanks!