summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorAdemar de Souza Reis Jr <areis@redhat.com>2011-12-05 16:54:14 -0300
committerStefan Hajnoczi <stefanha@linux.vnet.ibm.com>2011-12-06 10:10:21 +0000
commit69ddaf6659c006599b530feb50604a584c79f329 (patch)
treea0281e376a42a91560dc65013f3c4e43bda07b26 /docs
parent31b631936376042a503b5378d9716137b170b758 (diff)
downloadqemu-69ddaf6659c006599b530feb50604a584c79f329.zip
memory: minor documentation fixes/enhancements
Fix typos and minor documentation errors in both memory.h and docs/memory.txt. Also add missing documentation formatting tags to transaction functions. Reviewed-by: Stefan Weil <sw@weilnetz.de> Signed-off-by: Ademar de Souza Reis Jr <areis@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Diffstat (limited to 'docs')
-rw-r--r--docs/memory.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/memory.txt b/docs/memory.txt
index 3fc1683d88..5bbee8e85d 100644
--- a/docs/memory.txt
+++ b/docs/memory.txt
@@ -7,7 +7,7 @@ machine. It attempts to allow modelling of:
- ordinary RAM
- memory-mapped I/O (MMIO)
- memory controllers that can dynamically reroute physical memory regions
- to different destinations
+ to different destinations
The memory model provides support for
@@ -121,7 +121,7 @@ pci (0-2^32-1)
ram: ram@0x00000000-0xffffffff
-The is a (simplified) PC memory map. The 4GB RAM block is mapped into the
+This is a (simplified) PC memory map. The 4GB RAM block is mapped into the
system address space via two aliases: "lomem" is a 1:1 mapping of the first
3.5GB; "himem" maps the last 0.5GB at address 4GB. This leaves 0.5GB for the
so-called PCI hole, that allows a 32-bit PCI bus to exist in a system with
@@ -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, if .impl.max_access_size = 1.
+ emulated using four 1-byte writes, 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