summaryrefslogtreecommitdiff
path: root/include/exec
diff options
context:
space:
mode:
authorAvi Kivity <avi.kivity@gmail.com>2012-10-30 13:47:45 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2013-05-24 18:43:35 +0200
commit86a8623692b1b559a419a92eb8b6897c221bca74 (patch)
tree6cd80ea65366319d09ddded88acbafd2c63fbe39 /include/exec
parent311f83ca08c011b048c063c2fd3038a8957970bc (diff)
downloadqemu-86a8623692b1b559a419a92eb8b6897c221bca74.tar.gz
memory: limit sections in the radix tree to the actual address space size
The radix tree is statically sized to fit TARGET_PHYS_ADDR_SPACE_BITS. If a larger memory region is registered, it will overflow. Fix by limiting any section in the radix tree to the supported size. This problem was not observed earlier since artificial regions (containers and aliases) are eliminated by the memory core, leaving only device regions which have reasonable sizes. An IOMMU however cannot be eliminated by the memory core, and may have an artificial size. Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Avi Kivity <avi.kivity@gmail.com> [ Fail the build if TARGET_PHYS_ADDR_SPACE_BITS is too large - Paolo ] Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'include/exec')
-rw-r--r--include/exec/memory.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/exec/memory.h b/include/exec/memory.h
index 91be2a3c7a..fdf55feea1 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -26,6 +26,9 @@
#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;