From: Anthony Liguori <aliguori@us.ibm.com>
Date: Thu, 10 Jan 2013 19:26:12 +0000 (-0600)
Subject: Merge remote-tracking branch 'awilliam/tags/qemu-1.4-vfio-20130109.0' into staging
X-Git-Tag: pull-nvme-20200902~6805
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8757c09f15dcd455f81b4faed73da0d35d7e6b53;p=qemu-nvme.git

Merge remote-tracking branch 'awilliam/tags/qemu-1.4-vfio-20130109.0' into staging

vfio-pci: Fixes for qemu 1.4 & stable

* awilliam/tags/qemu-1.4-vfio-20130109.0:
  vfio-pci: Loosen sanity checks to allow future features
  vfio-pci: Make host MSI-X enable track guest

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

8757c09f15dcd455f81b4faed73da0d35d7e6b53