Patchwork [08/25] Revert "memory: limit sections in the radix tree to the actual address space size"

login
register
mail settings
Submitter Paolo Bonzini
Date June 20, 2013, 2:44 p.m.
Message ID <1371739493-10187-9-git-send-email-pbonzini@redhat.com>
Download mbox | patch
Permalink /patch/253021/
State New
Headers show

Comments

Paolo Bonzini - June 20, 2013, 2:44 p.m.
This reverts commit 86a8623692b1b559a419a92eb8b6897c221bca74.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 exec.c                | 13 +------------
 include/exec/memory.h |  3 ---
 2 files changed, 1 insertion(+), 15 deletions(-)

Patch

diff --git a/exec.c b/exec.c
index 3a8ef42..0448224 100644
--- a/exec.c
+++ b/exec.c
@@ -835,21 +835,10 @@  static void register_multipage(AddressSpaceDispatch *d, MemoryRegionSection *sec
                   section_index);
 }
 
-QEMU_BUILD_BUG_ON(TARGET_PHYS_ADDR_SPACE_BITS > MAX_PHYS_ADDR_SPACE_BITS)
-
-static MemoryRegionSection limit(MemoryRegionSection section)
-{
-    section.size = MIN(section.offset_within_address_space + section.size,
-                       MAX_PHYS_ADDR + 1)
-                   - section.offset_within_address_space;
-
-    return section;
-}
-
 static void mem_add(MemoryListener *listener, MemoryRegionSection *section)
 {
     AddressSpaceDispatch *d = container_of(listener, AddressSpaceDispatch, listener);
-    MemoryRegionSection now = limit(*section), remain = limit(*section);
+    MemoryRegionSection now = *section, remain = *section;
 
     if ((now.offset_within_address_space & ~TARGET_PAGE_MASK)
         || (now.size < TARGET_PAGE_SIZE)) {
diff --git a/include/exec/memory.h b/include/exec/memory.h
index c747f67..c11a3f8 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -26,9 +26,6 @@ 
 #include "exec/ioport.h"
 #include "qemu/int128.h"
 
-#define MAX_PHYS_ADDR_SPACE_BITS 62
-#define MAX_PHYS_ADDR            (((hwaddr)1 << MAX_PHYS_ADDR_SPACE_BITS) - 1)
-
 typedef struct MemoryRegionOps MemoryRegionOps;
 typedef struct MemoryRegionPortio MemoryRegionPortio;
 typedef struct MemoryRegionMmio MemoryRegionMmio;