summary refs log tree commit diff stats
path: root/scripts/qemugdb
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-04-04 17:27:32 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-04-04 17:27:32 +0100
commit2c9938c5d71a634fd71c731658f57d9ba6299bad (patch)
tree4117f20527a8a40d6a434c0ba6dd9871796d45c9 /scripts/qemugdb
parentfa902c8ca0f3b83e0e3dda1e9e00f0b1d28e718a (diff)
parent193982c6f9424779b53a168fe32ebc30a776cbf1 (diff)
downloadfocaccia-qemu-2c9938c5d71a634fd71c731658f57d9ba6299bad.tar.gz
focaccia-qemu-2c9938c5d71a634fd71c731658f57d9ba6299bad.zip
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
pci: fix

A single bugfix for a error handling issue in pci.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

# gpg: Signature made Tue 04 Apr 2017 16:33:04 BST
# gpg:                using RSA key 0x281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
#      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469

* remotes/mst/tags/for_upstream:
  pci: Only unmap bus_master_enabled_region if was added previously

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