From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 12 Jul 2018 10:05:21 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/awilliam/tags/vfio-fixes-20180711.1' into staging
X-Git-Tag: v3.0.0-rc1~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=87130a0d43158f046873a7de7e1df45c45d6c8a8;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'remotes/awilliam/tags/vfio-fixes-20180711.1' into staging

VFIO fixes 2018-07-11

 - Avoid RAMBlock segfault in option ROM teardown for vfio-pci devices
   (Cédric Le Goater)

# gpg: Signature made Wed 11 Jul 2018 20:44:44 BST
# gpg:                using RSA key 239B9B6E3BB08B22
# 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-fixes-20180711.1:
  vfio/pci: do not set the PCIDevice 'has_rom' attribute

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

87130a0d43158f046873a7de7e1df45c45d6c8a8