From: Avi Kivity <avi@redhat.com>
Date: Thu, 11 Aug 2011 11:40:58 +0000 (+0300)
Subject: pci: simplify memory region registration
X-Git-Tag: v1.0-rc0~82^2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8b881e776a45cc1ee18f4bc8182bbc1d2aed56e8;p=thirdparty%2Fqemu.git

pci: simplify memory region registration

The two code paths (for ADDRESS_SPACE_IO and ADDRESS_SPACE_MEM) are
identical.  Unify them.

Signed-off-by: Avi Kivity <avi@redhat.com>
---

diff --git a/hw/pci.c b/hw/pci.c
index 749e8d86ca7..e8cc1b046ff 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);
         }
     }
 }