Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
commitec7a8bf0b8f7dc7288fe8745464ee8217528cc6c
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 6 Nov 2017 10:04:16 +0000 (6 10:04 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 6 Nov 2017 10:04:16 +0000 (6 10:04 +0000)
tree4f470a0055f24505c86d789e746731c49d99fb45
parentb33afc415622e5eb26e0f14fd27eb86e32a5472e
parent20bc94a2b8449b7700b6bfa25a87ce2320a1c649
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging

* Remove legacy KVM PCI device assignment
* Fix qemu-pr-helper.c compilation on older compilers

# gpg: Signature made Sun 05 Nov 2017 13:52:36 GMT
# gpg:                using RSA key 0xBFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini/tags/for-upstream:
  build: disable -Wmissing-braces on older compilers
  pci-assign: Remove

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