qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Eric Auger <eric.auger@linaro.org>
To: eric.auger@st.com, eric.auger@linaro.org, qemu-devel@nongnu.org,
	alex.williamson@redhat.com, peter.maydell@linaro.org,
	agraf@suse.de, b.reynal@virtualopensystems.com
Cc: kim.phillips@freescale.com, patches@linaro.org,
	a.rigo@virtualopensystems.com, pbonzini@redhat.com,
	kvmarm@lists.cs.columbia.edu, christoffer.dall@linaro.org
Subject: [Qemu-devel] [PATCH v11 1/9] linux-headers: update VFIO header for VFIO platform/amba drivers
Date: Thu, 19 Mar 2015 10:05:30 +0000	[thread overview]
Message-ID: <1426759538-18030-2-git-send-email-eric.auger@linaro.org> (raw)
In-Reply-To: <1426759538-18030-1-git-send-email-eric.auger@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 <linux/types.h>
 #include <linux/ioctl.h>
@@ -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

  reply	other threads:[~2015-03-19 10:05 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-19 10:05 [Qemu-devel] [PATCH v11 0/9] KVM platform device passthrough Eric Auger
2015-03-19 10:05 ` Eric Auger [this message]
2015-03-19 10:05 ` [Qemu-devel] [PATCH v11 2/9] hw/vfio/platform: vfio-platform skeleton Eric Auger
2015-03-19 10:05 ` [Qemu-devel] [PATCH v11 3/9] hw/vfio/platform: add irq assignment Eric Auger
2015-03-19 10:05 ` [Qemu-devel] [PATCH v11 4/9] hw/vfio/platform: add capability to start IRQ propagation Eric Auger
2015-03-19 10:05 ` [Qemu-devel] [PATCH v11 5/9] hw/arm/virt: start VFIO " Eric Auger
2015-03-19 10:05 ` [Qemu-devel] [PATCH v11 6/9] hw/vfio/platform: calxeda xgmac device Eric Auger
2015-03-19 10:05 ` [Qemu-devel] [PATCH v11 7/9] hw/arm/sysbus-fdt: enable vfio-calxeda-xgmac dynamic instantiation Eric Auger
2015-03-19 10:05 ` [Qemu-devel] [PATCH v11 8/9] linux-headers: update arm/arm64 KVM headers for irqfd Eric Auger
2015-03-19 10:05 ` [Qemu-devel] [PATCH v11 9/9] hw/vfio/platform: add irqfd support Eric Auger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1426759538-18030-2-git-send-email-eric.auger@linaro.org \
    --to=eric.auger@linaro.org \
    --cc=a.rigo@virtualopensystems.com \
    --cc=agraf@suse.de \
    --cc=alex.williamson@redhat.com \
    --cc=b.reynal@virtualopensystems.com \
    --cc=christoffer.dall@linaro.org \
    --cc=eric.auger@st.com \
    --cc=kim.phillips@freescale.com \
    --cc=kvmarm@lists.cs.columbia.edu \
    --cc=patches@linaro.org \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).