diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-20 08:43:00 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-20 08:43:00 -0500 |
| commit | 46cd37e7718f6c2c502228a61b3a0811c849c52f (patch) | |
| tree | 9f294a290b09a548892b90151a571740297aaf7e /hw/pci.c | |
| parent | 1f99b94932fcf0a543e46e24875fc2b3a8c304a7 (diff) | |
| parent | d08151bf7c022cec3e488d72ed9c429b04979f40 (diff) | |
| download | focaccia-qemu-46cd37e7718f6c2c502228a61b3a0811c849c52f.tar.gz focaccia-qemu-46cd37e7718f6c2c502228a61b3a0811c849c52f.zip | |
Merge remote-tracking branch 'qemu-kvm-tmp/memory/batch' into staging
Diffstat (limited to 'hw/pci.c')
| -rw-r--r-- | hw/pci.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/hw/pci.c b/hw/pci.c index 749e8d86ca..e8cc1b046f 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -998,17 +998,8 @@ static void pci_update_mappings(PCIDevice *d) } r->addr = new_addr; if (r->addr != PCI_BAR_UNMAPPED) { - if (r->type & PCI_BASE_ADDRESS_SPACE_IO) { - memory_region_add_subregion_overlap(r->address_space, - r->addr, - r->memory, - 1); - } else { - memory_region_add_subregion_overlap(r->address_space, - r->addr, - r->memory, - 1); - } + memory_region_add_subregion_overlap(r->address_space, + r->addr, r->memory, 1); } } } |