diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-03-30 13:55:40 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-03-30 13:55:40 +0100 |
| commit | e68dd68496e89a48415e1f088f13d4dd59fe8560 (patch) | |
| tree | a2e0a15685da2a273012d20d92cafa594aa372ac /hw | |
| parent | fb59dabd4fa7e6586824ac3012073b943fc8dc79 (diff) | |
| parent | b8adbc657802482e4da1767bf983ebfdf9bfe9fc (diff) | |
| download | qemu-e68dd68496e89a48415e1f088f13d4dd59fe8560.zip qemu-e68dd68496e89a48415e1f088f13d4dd59fe8560.tar.gz qemu-e68dd68496e89a48415e1f088f13d4dd59fe8560.tar.bz2 | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
virtio, pci: fixes
More fixes for 2.9.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Wed 29 Mar 2017 00:35:49 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:
virtio: fix vring_align() on 64-bit windows
pci: Add missing drop of bus master AS reference
event_notifier: prevent accidental use after close
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/pci/pci.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/hw/pci/pci.c b/hw/pci/pci.c index e6b08e1..bd8043c 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -869,6 +869,8 @@ static void do_pci_unregister_device(PCIDevice *pci_dev) pci_dev->bus->devices[pci_dev->devfn] = NULL; pci_config_free(pci_dev); + memory_region_del_subregion(&pci_dev->bus_master_container_region, + &pci_dev->bus_master_enable_region); address_space_destroy(&pci_dev->bus_master_as); } |