From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47225) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYe3z-0000g5-QN for qemu-devel@nongnu.org; Thu, 19 Mar 2015 13:17:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YYe3u-00058T-BC for qemu-devel@nongnu.org; Thu, 19 Mar 2015 13:16:55 -0400 Received: from mail-wi0-f176.google.com ([209.85.212.176]:33201) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYe3u-00058P-5G for qemu-devel@nongnu.org; Thu, 19 Mar 2015 13:16:50 -0400 Received: by wixw10 with SMTP id w10so13295732wix.0 for ; Thu, 19 Mar 2015 10:16:49 -0700 (PDT) From: Eric Auger Date: Thu, 19 Mar 2015 17:16:33 +0000 Message-Id: <1426785402-2091-2-git-send-email-eric.auger@linaro.org> In-Reply-To: <1426785402-2091-1-git-send-email-eric.auger@linaro.org> References: <1426785402-2091-1-git-send-email-eric.auger@linaro.org> Subject: [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@st.com, eric.auger@linaro.org, qemu-devel@nongnu.org, alex.williamson@redhat.com, peter.maydell@linaro.org, agraf@suse.de Cc: kim.phillips@freescale.com, b.reynal@virtualopensystems.com, patches@linaro.org, a.rigo@virtualopensystems.com, pbonzini@redhat.com, alex.bennee@linaro.org, kvmarm@lists.cs.columbia.edu, christoffer.dall@linaro.org Update according to the vfio.h header found in ssh://git@git.linaro.org/people/eric.auger/linux.git branch 4.0-rc3-v14 --- 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 */ -- 1.8.3.2