From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39598) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YirtE-0000eU-Ay for qemu-devel@nongnu.org; Thu, 16 Apr 2015 18:04:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yirt9-0000ag-Iz for qemu-devel@nongnu.org; Thu, 16 Apr 2015 18:04:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43838) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yirt9-0000aK-DN for qemu-devel@nongnu.org; Thu, 16 Apr 2015 18:03:59 -0400 Message-ID: <1429221834.10086.36.camel@redhat.com> From: Alex Williamson Date: Thu, 16 Apr 2015 16:03:54 -0600 In-Reply-To: <1426785402-2091-2-git-send-email-eric.auger@linaro.org> References: <1426785402-2091-1-git-send-email-eric.auger@linaro.org> <1426785402-2091-2-git-send-email-eric.auger@linaro.org> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v12 1/9] linux-headers: update VFIO header for VFIO platform/amba drivers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eric Auger Cc: b.reynal@virtualopensystems.com, peter.maydell@linaro.org, kim.phillips@freescale.com, eric.auger@st.com, patches@linaro.org, qemu-devel@nongnu.org, agraf@suse.de, pbonzini@redhat.com, alex.bennee@linaro.org, kvmarm@lists.cs.columbia.edu, christoffer.dall@linaro.org, a.rigo@virtualopensystems.com On Thu, 2015-03-19 at 17:16 +0000, Eric Auger wrote: > Update according to the vfio.h header found in > ssh://git@git.linaro.org/people/eric.auger/linux.git > branch 4.0-rc3-v14 A Sign-off is still needed here. > --- > > v10 -> v11: > - only includes header modifications related to vfio platform > driver v14 and not those related to > "vfio: type1: support for ARM SMMUS with VFIO_IOMMU_TYPE1" > --- > linux-headers/linux/vfio.h | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/linux-headers/linux/vfio.h b/linux-headers/linux/vfio.h > index 95ba870..b57b750 100644 > --- a/linux-headers/linux/vfio.h > +++ b/linux-headers/linux/vfio.h > @@ -8,8 +8,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 > #include > @@ -160,6 +160,8 @@ struct vfio_device_info { > __u32 flags; > #define VFIO_DEVICE_FLAGS_RESET (1 << 0) /* Device supports reset */ > #define VFIO_DEVICE_FLAGS_PCI (1 << 1) /* vfio-pci device */ > +#define VFIO_DEVICE_FLAGS_PLATFORM (1 << 2) /* vfio-platform device */ > +#define VFIO_DEVICE_FLAGS_AMBA (1 << 3) /* vfio-amba device */ > __u32 num_regions; /* Max region index + 1 */ > __u32 num_irqs; /* Max IRQ index + 1 */ > }; > @@ -495,4 +497,4 @@ struct vfio_eeh_pe_op { > > /* ***************************************************************** */ > > -#endif /* VFIO_H */ > +#endif /* _UAPIVFIO_H */