summaryrefslogtreecommitdiff
path: root/docs/memory.txt
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2011-08-08 19:58:50 +0300
committerAnthony Liguori <aliguori@us.ibm.com>2011-08-12 08:31:30 -0500
commit7075ba3097091507de89650f6e4e247f7411ebad (patch)
tree5248f310e4b819d1f627d27fb75ff43c943d6f19 /docs/memory.txt
parentd0a9b5bc0a6abdab182ad55dcc1c71508c163c5c (diff)
downloadqemu-7075ba3097091507de89650f6e4e247f7411ebad.tar.gz
qemu-7075ba3097091507de89650f6e4e247f7411ebad.tar.bz2
qemu-7075ba3097091507de89650f6e4e247f7411ebad.zip
memory: correct documentation typos
Noted by Drew Jones. Signed-off-by: Avi Kivity <avi@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'docs/memory.txt')
-rw-r--r--docs/memory.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/memory.txt b/docs/memory.txt
index 4460c0641a..3fc1683d88 100644
--- a/docs/memory.txt
+++ b/docs/memory.txt
@@ -15,7 +15,7 @@ The memory model provides support for
- setting up coalesced memory for kvm
- setting up ioeventfd regions for kvm
-Memory is modelled as an tree (really acyclic graph) of MemoryRegion objects.
+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.
@@ -87,7 +87,7 @@ guest accesses an address:
descending priority order
- if the address lies outside the region offset/size, the subregion is
discarded
- - if the subregion is a leaf (RAM or MMIO), the seach terminates
+ - if the subregion is a leaf (RAM or MMIO), the search terminates
- if the subregion is a container, the same algorithm is used within the
subregion (after the address is adjusted by the subregion offset)
- if the subregion is an alias, the search is continues at the alias target
@@ -128,7 +128,7 @@ so-called PCI hole, that allows a 32-bit PCI bus to exist in a system with
4GB of memory.
The memory controller diverts addresses in the range 640K-768K to the PCI
-address space. This is modeled using the "vga-window" alias, mapped at a
+address space. This is modelled using the "vga-window" alias, mapped at a
higher priority so it obscures the RAM at the same addresses. The vga window
can be removed by programming the memory controller; this is modelled by
removing the alias and exposing the RAM underneath.
@@ -164,7 +164,7 @@ various constraints can be supplied to control how these callbacks are called:
- .impl.min_access_size, .impl.max_access_size define the access sizes
(in bytes) supported by the *implementation*; other access sizes will be
emulated using the ones available. For example a 4-byte write will be
- emulated using four 1-byte write, is .impl.max_access_size = 1.
+ emulated using four 1-byte write, if .impl.max_access_size = 1.
- .impl.valid specifies that the *implementation* only supports unaligned
accesses; unaligned accesses will be emulated by two aligned accesses.
- .old_portio and .old_mmio can be used to ease porting from code using