Re: [Qemu-devel] [PATCH 1/5] vfio: vfio_iommu_type1: linux header place holder

[Pierre Morel]

On 12/05/2019 20:22, Michael S. Tsirkin wrote:
> On Fri, May 10, 2019 at 04:38:49PM +0200, Pierre Morel wrote:
> > This should be copied from Linux kernel UAPI includes.
> >
> > Signed-off-by: Pierre Morel <address@hidden>
>
> pls add a note which linux version did you sync with.

I will, thanks.
Pierre

> > ---
> >   linux-headers/linux/vfio.h | 16 +++++++++++++---
> >   1 file changed, 13 insertions(+), 3 deletions(-)
> >
> > diff --git a/linux-headers/linux/vfio.h b/linux-headers/linux/vfio.h
> > index 12a7b1d..eaecaef 100644
> > --- a/linux-headers/linux/vfio.h
> > +++ b/linux-headers/linux/vfio.h
> > @@ -9,8 +9,8 @@
> >    * it under the terms of the GNU General Public License version 2 as
> >    * published by the Free Software Foundation.
> >    */
> > -#ifndef VFIO_H
> > -#define VFIO_H
> > +#ifndef _UAPIVFIO_H
> > +#define _UAPIVFIO_H
> >   
> >   #include <linux/types.h>
> >   #include <linux/ioctl.h>
> > @@ -711,6 +711,16 @@ struct vfio_iommu_type1_info {
> >         __u32   flags;
> >   #define VFIO_IOMMU_INFO_PGSIZES (1 << 0)        /* supported page sizes info 
> > */
> >         __u64   iova_pgsizes;           /* Bitmap of supported page sizes */
> > +#define VFIO_IOMMU_INFO_CAPABILITIES (1 << 1)  /* support capabilities info */
> > +       __u64   cap_offset;     /* Offset within info struct of first cap */
> > +};
> > +
> > +#define VFIO_IOMMU_INFO_CAP_QFN                1
> > +#define VFIO_IOMMU_INFO_CAP_QGRP       2
> > +
> > +struct vfio_iommu_type1_info_block {
> > +       struct vfio_info_cap_header header;
> > +       __u32 data[];
> >   };
> >   
> >   #define VFIO_IOMMU_GET_INFO _IO(VFIO_TYPE, VFIO_BASE + 12)
> > @@ -910,4 +920,4 @@ struct vfio_iommu_spapr_tce_remove {
> >   
> >   /* ***************************************************************** */
> >   
> > -#endif /* VFIO_H */
> > +#endif /* _UAPIVFIO_H */
> > --
> > 2.7.4


--
Pierre Morel
Linux/KVM/QEMU in Böblingen - Germany