aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2013-05-13 09:44:25 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2013-05-13 09:44:25 -0500
commitf6e136e47a6adc176cb53a24cf5a515ca09f977f (patch)
tree6ba37c38ba2dd0af4a3f889f7c1f9e88c609f984 /docs
parent879367efba1f2e9733ff76d03041324b5b76f645 (diff)
parent98b2d199c109c9eabebb70965db0ae24f3f75a79 (diff)
downloadqemu-f6e136e47a6adc176cb53a24cf5a515ca09f977f.zip
qemu-f6e136e47a6adc176cb53a24cf5a515ca09f977f.tar.gz
qemu-f6e136e47a6adc176cb53a24cf5a515ca09f977f.tar.bz2
Merge remote-tracking branch 'mjt/trivial-patches-next' into staging
# By Dong Xu Wang (2) and others # Via Michael Tokarev * mjt/trivial-patches-next: osdep.h: include sys/types.h for ssize_t definition remove double semicolons clean unnecessary code: don't check g_strdup arg for NULL docs: mention AddressSpaces in docs/memory.txt audio: update documentation after removing --audio-card-list option m25p80.c: Sync Flash chip list with Linux bsd-user: OS-agnostic 64-bit SYSCTL types Message-id: 518F61B9.9050803@msgid.tls.msk.ru Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'docs')
-rw-r--r--docs/memory.txt11
1 files changed, 7 insertions, 4 deletions
diff --git a/docs/memory.txt b/docs/memory.txt
index 5bbee8e..feb9fe9 100644
--- a/docs/memory.txt
+++ b/docs/memory.txt
@@ -15,10 +15,13 @@ The memory model provides support for
- setting up coalesced memory for kvm
- setting up ioeventfd regions for kvm
-Memory is modelled as a tree (really acyclic graph) of MemoryRegion objects.
-The root of the tree is memory as seen from the CPU's viewpoint (the system
-bus). Nodes in the tree represent other buses, memory controllers, and
-memory regions that have been rerouted. Leaves are RAM and MMIO regions.
+Memory is modelled as an acyclic graph of MemoryRegion objects. Sinks
+(leaves) are RAM and MMIO regions, while other nodes represent
+buses, memory controllers, and memory regions that have been rerouted.
+
+In addition to MemoryRegion objects, the memory API provides AddressSpace
+objects for every root and possibly for intermediate MemoryRegions too.
+These represent memory as seen from the CPU or a device's viewpoint.
Types of regions
----------------