From patchwork Mon Mar 7 17:36:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 63647 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp1584303lbc; Mon, 7 Mar 2016 09:40:19 -0800 (PST) X-Received: by 10.140.96.137 with SMTP id k9mr30057299qge.23.1457372419229; Mon, 07 Mar 2016 09:40:19 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id w74si17808460qgw.78.2016.03.07.09.40.19 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 07 Mar 2016 09:40:19 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org Received: from localhost ([::1]:57401 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1acz8k-0008I8-MQ for patch@linaro.org; Mon, 07 Mar 2016 12:40:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47452) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1acz5u-0003xL-Ra for qemu-devel@nongnu.org; Mon, 07 Mar 2016 12:37:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1acz5t-0003LU-U4 for qemu-devel@nongnu.org; Mon, 07 Mar 2016 12:37:22 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53457) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1acz5t-0003LN-Oj for qemu-devel@nongnu.org; Mon, 07 Mar 2016 12:37:21 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 6461DD7921; Mon, 7 Mar 2016 17:37:21 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-112-28.ams2.redhat.com [10.36.112.28]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u27Hb1Zd001810; Mon, 7 Mar 2016 12:37:20 -0500 From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 7 Mar 2016 18:36:58 +0100 Message-Id: <1457372221-19285-13-git-send-email-pbonzini@redhat.com> In-Reply-To: <1457372221-19285-1-git-send-email-pbonzini@redhat.com> References: <1457372221-19285-1-git-send-email-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 07 Mar 2016 17:37:21 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Cc: Peter Maydell Subject: [Qemu-devel] [PULL 12/15] doc/memory.txt: correct description of MemoryRegionOps fields 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Peter Maydell Probably what happened was that when the API was being designed it started off with an 'aligned' field, and then later the field name and semantics were changed but the docs weren't updated to match. Similarly, cpu_register_io_memory() does not exist anymore, so clarify the documentation for .old_mmio. Reported-by: Cao jin Signed-off-by: Peter Maydell Signed-off-by: Paolo Bonzini --- docs/memory.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -- 2.5.0 diff --git a/docs/memory.txt b/docs/memory.txt index d0aca05..97134e1 100644 --- a/docs/memory.txt +++ b/docs/memory.txt @@ -297,8 +297,9 @@ various constraints can be supplied to control how these callbacks are called: - .valid.min_access_size, .valid.max_access_size define the access sizes (in bytes) which the device accepts; accesses outside this range will have device and bus specific behaviour (ignored, or machine check) - - .valid.aligned specifies that the device only accepts naturally aligned - accesses. Unaligned accesses invoke device and bus specific behaviour. + - .valid.unaligned specifies that the *device being modelled* supports + unaligned accesses; if false, unaligned accesses will invoke the + appropriate bus or CPU specific behaviour. - .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 @@ -306,5 +307,5 @@ various constraints can be supplied to control how these callbacks are called: - .impl.unaligned specifies that the *implementation* supports unaligned accesses; if false, unaligned accesses will be emulated by two aligned accesses. - - .old_mmio can be used to ease porting from code using + - .old_mmio eases the porting of code that was formerly using cpu_register_io_memory(). It should not be used in new code.