diff mbox

[07/21] Revert "memory: limit sections in the radix tree to the actual address space size"

Message ID 1369948629-2833-8-git-send-email-pbonzini@redhat.com
State New
Headers show

Commit Message

Paolo Bonzini May 30, 2013, 9:16 p.m. UTC 
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(-)

Comments

Richard Henderson May 31, 2013, 10:04 p.m. UTC | #1 
On 05/30/2013 02:16 PM, Paolo Bonzini wrote:
> 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(-)

I would think that both the 7/ and 8/ reversion patches would
have to be after 10/ in order to be bi-sectable?


r~
Paolo Bonzini June 1, 2013, 6:29 a.m. UTC | #2 
Il 01/06/2013 00:04, Richard Henderson ha scritto:
> On 05/30/2013 02:16 PM, Paolo Bonzini wrote:
>> 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(-)
> 
> I would think that both the 7/ and 8/ reversion patches would
> have to be after 10/ in order to be bi-sectable?

Not necessary, it only matters after IOMMU regions are introduced.
Normal regions are never 2^64 bytes in size.

Putting the reversion afterwards would conflict.

Paolo
diff mbox

Patch

diff --git a/exec.c b/exec.c
index 2a81b6e..e3a08d6 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;