From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53836) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZcpCd-0002FX-LH for qemu-devel@nongnu.org; Fri, 18 Sep 2015 02:31:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZcpCa-0001ly-Fc for qemu-devel@nongnu.org; Fri, 18 Sep 2015 02:31:23 -0400 Received: from e23smtp06.au.ibm.com ([202.81.31.148]:38900) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZcpCZ-0001hZ-SY for qemu-devel@nongnu.org; Fri, 18 Sep 2015 02:31:20 -0400 Received: from /spool/local by e23smtp06.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 18 Sep 2015 16:31:16 +1000 From: Gavin Shan Date: Fri, 18 Sep 2015 16:30:13 +1000 Message-Id: <1442557816-23067-2-git-send-email-gwshan@linux.vnet.ibm.com> In-Reply-To: <1442557816-23067-1-git-send-email-gwshan@linux.vnet.ibm.com> References: <1442557816-23067-1-git-send-email-gwshan@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH RFC 1/4] linux-headers: Sync vfio.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: alex.williamson@redhat.com, qemu-ppc@nongnu.org, Gavin Shan , david@gibson.dropbear.id.au This synchronizes the Linux header vfio.h because of the changes introduced by below Linux commits: 900facd ("drivers/vfio: Support IOMMU group for EEH operations") 108f78d ("drivers/vfio: Support EEH API revision") Signed-off-by: Gavin Shan --- linux-headers/linux/vfio.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/linux-headers/linux/vfio.h b/linux-headers/linux/vfio.h index aa276bc..0cf1c57 100644 --- a/linux-headers/linux/vfio.h +++ b/linux-headers/linux/vfio.h @@ -495,6 +495,10 @@ struct vfio_iommu_spapr_tce_info { * - configure PE; * - inject EEH error. */ +#define VFIO_EEH_DISABLED 0 +#define VFIO_EEH_ENABLED_V1 1 +#define VFIO_EEH_ENABLED_V2 2 + struct vfio_eeh_pe_err { __u32 type; __u32 func; @@ -505,7 +509,9 @@ struct vfio_eeh_pe_err { struct vfio_eeh_pe_op { __u32 argsz; __u32 flags; +#define VFIO_EEH_ENABLED_MASK 0xFF __u32 op; + __u32 groupid; union { struct vfio_eeh_pe_err err; }; -- 2.1.0