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 /hw/vfio/platform.c | |
| 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 'hw/vfio/platform.c')
| -rw-r--r-- | hw/vfio/platform.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c index a4663c918e..7c09deda61 100644 --- a/hw/vfio/platform.c +++ b/hw/vfio/platform.c @@ -640,6 +640,7 @@ static void vfio_platform_realize(DeviceState *dev, Error **errp) int i, ret; vbasedev->type = VFIO_DEVICE_TYPE_PLATFORM; + vbasedev->dev = dev; vbasedev->ops = &vfio_platform_ops; trace_vfio_platform_realize(vbasedev->sysfsdev ? |