summary refs log tree commit diff stats
path: root/hw/core/machine.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-07-18 16:43:47 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-07-18 16:43:47 +0100
commit9d836fc552cce747a0946473726ff25262130351 (patch)
tree31bbc5b80f1a214065fe165c80db9434c556d799 /hw/core/machine.c
parent368e708b4c95501574ab11632c7a0b8bb3ddc7e8 (diff)
parent8c37faa475f35d158622422788fe8e5aef3118e1 (diff)
downloadfocaccia-qemu-9d836fc552cce747a0946473726ff25262130351.tar.gz
focaccia-qemu-9d836fc552cce747a0946473726ff25262130351.zip
Merge remote-tracking branch 'remotes/awilliam/tags/vfio-updates-20170717.0' into staging
VFIO fixes 2017-07-17

 - Init re-order to better support hot-add on SPAR (Alexey Kardashevskiy)

# gpg: Signature made Mon 17 Jul 2017 21:33:01 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-20170717.0:
  vfio-pci, ppc64/spapr: Reorder group-to-container attaching

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/core/machine.c')
0 files changed, 0 insertions, 0 deletions