From patchwork Mon Aug 8 16:58:50 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avi Kivity X-Patchwork-Id: 108993 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AA84BB6F71 for ; Tue, 9 Aug 2011 02:59:19 +1000 (EST) Received: from localhost ([::1]:50121 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QqTAZ-0002fC-3q for incoming@patchwork.ozlabs.org; Mon, 08 Aug 2011 12:59:15 -0400 Received: from eggs.gnu.org ([140.186.70.92]:55784) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QqTAJ-0002CF-CL for qemu-devel@nongnu.org; Mon, 08 Aug 2011 12:59:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QqTAF-0000UV-NS for qemu-devel@nongnu.org; Mon, 08 Aug 2011 12:58:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50460) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QqTAF-0000UC-Dx for qemu-devel@nongnu.org; Mon, 08 Aug 2011 12:58:55 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p78GwsoX011888 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 8 Aug 2011 12:58:54 -0400 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p78Gwr8o003203; Mon, 8 Aug 2011 12:58:53 -0400 Received: from s01.tlv.redhat.com (s01.tlv.redhat.com [10.35.255.8]) by cleopatra.tlv.redhat.com (Postfix) with ESMTP id 9C3D1250B45; Mon, 8 Aug 2011 19:58:52 +0300 (IDT) From: Avi Kivity To: qemu-devel@nongnu.org Date: Mon, 8 Aug 2011 19:58:50 +0300 Message-Id: <1312822730-9577-4-git-send-email-avi@redhat.com> In-Reply-To: <1312822730-9577-1-git-send-email-avi@redhat.com> References: <1312822730-9577-1-git-send-email-avi@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH 3/3] memory: correct documentation typos X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Noted by Drew Jones. Signed-off-by: Avi Kivity --- docs/memory.txt | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/memory.txt b/docs/memory.txt index 4460c06..3fc1683 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