diff options
| author | Peter Maydell | 2017-07-11 14:47:28 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-07-11 14:47:28 +0200 |
| commit | 29741be341d50e4311e42ca3199f9b0bcfd4f5d2 (patch) | |
| tree | b2ee1051648337a875b31b875ea38b81d38a942c /include | |
| parent | build: disable Xen on ARM (diff) | |
| parent | vfio/pci: Fixup v0 PCIe capabilities (diff) | |
| download | qemu-29741be341d50e4311e42ca3199f9b0bcfd4f5d2.tar.gz qemu-29741be341d50e4311e42ca3199f9b0bcfd4f5d2.tar.xz qemu-29741be341d50e4311e42ca3199f9b0bcfd4f5d2.zip | |
Merge remote-tracking branch 'remotes/awilliam/tags/vfio-updates-20170710.0' into staging
VFIO fixes 2017-07-10
- Don't iterate over non-realized devices (Alex Williamson)
- Add PCIe capability version fixup (Alex Williamson)
# gpg: Signature made Mon 10 Jul 2017 20:06:11 BST
# gpg: using RSA key 0x239B9B6E3BB08B22
# gpg: Good signature from "Alex Williamson <alex.williamson@redhat.com>"
# gpg: aka "Alex Williamson <alex@shazbot.org>"
# gpg: aka "Alex Williamson <alwillia@redhat.com>"
# gpg: aka "Alex Williamson <alex.l.williamson@gmail.com>"
# Primary key fingerprint: 42F6 C04E 540B D1A9 9E7B 8A90 239B 9B6E 3BB0 8B22
* remotes/awilliam/tags/vfio-updates-20170710.0:
vfio/pci: Fixup v0 PCIe capabilities
vfio: Test realized when using VFIOGroup.device_list iterator
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/vfio/vfio-common.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h index 9521013d52..0b475a3596 100644 --- a/include/hw/vfio/vfio-common.h +++ b/include/hw/vfio/vfio-common.h @@ -115,6 +115,7 @@ typedef struct VFIODevice { struct VFIOGroup *group; char *sysfsdev; char *name; + DeviceState *dev; int fd; int type; bool reset_works; |