diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-05-27 13:18:01 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-06-20 16:32:46 +0200 |
| commit | 99b9cc0679585b2d495d7d31ce556549b6b2721c (patch) | |
| tree | 4b71cef210e28fcd8c7c89b668eba26eb8407075 | |
| parent | 5c8a00ce186b9a58d99b0afff90f87d5760bb44b (diff) | |
| download | focaccia-qemu-99b9cc0679585b2d495d7d31ce556549b6b2721c.tar.gz focaccia-qemu-99b9cc0679585b2d495d7d31ce556549b6b2721c.zip | |
Revert "memory: limit sections in the radix tree to the actual address space size"
This reverts commit 86a8623692b1b559a419a92eb8b6897c221bca74. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | exec.c | 13 | ||||
| -rw-r--r-- | include/exec/memory.h | 3 |
2 files changed, 1 insertions, 15 deletions
diff --git a/exec.c b/exec.c index 3a8ef42e3e..0448224609 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 c747f67c83..c11a3f8e9c 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; |