From patchwork Fri Sep 14 08:42:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 183858 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AD0772C008B for ; Fri, 14 Sep 2012 19:40:35 +1000 (EST) Received: from localhost ([::1]:38465 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TCRVF-0003cv-Lk for incoming@patchwork.ozlabs.org; Fri, 14 Sep 2012 04:43:57 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37220) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TCRUH-000210-F0 for qemu-devel@nongnu.org; Fri, 14 Sep 2012 04:43:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TCRUB-0007Zf-MM for qemu-devel@nongnu.org; Fri, 14 Sep 2012 04:42:57 -0400 Received: from mail-we0-f173.google.com ([74.125.82.173]:36282) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TCRUB-0007Vp-GO for qemu-devel@nongnu.org; Fri, 14 Sep 2012 04:42:51 -0400 Received: by mail-we0-f173.google.com with SMTP id z53so2179729wey.4 for ; Fri, 14 Sep 2012 01:42:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=u4lI4upzN2vUHdIbLE8uHK3GqGoRPIR1W3SCbAzrdLI=; b=qyEoShsSPF2GqkxnkXFK5Ez8TiTCRAsb0qeytWrEbnNgxhXf1cHDGZ4dAgMufu/UJG gxx6cyiNcV+vTB3hp0VkuUQ2S/BdLA3ASKC9Lw1KZvxJvlbaigAqe58OaggzUJQQdyA8 4vC1EDik/qbcDlwhQMHfHXm7pf0QcZnYO+uyAg9aY4xBrPhqyt5Npje2gqdDF/cbCXlz iiY40fOSlJyknXryW4JyzVi6ugWLasMQdl3AqUAeFMc7EfNO9GfXvEYVCdb01ZyO0Yq8 mp4WdDe1PPG5fU5V6SeDPwaGl0M7v3P+KVHhONt8gqfJVa5gk4rARmL7TWEyMoXLW+Af 22rQ== Received: by 10.180.14.8 with SMTP id l8mr4429302wic.6.1347612171110; Fri, 14 Sep 2012 01:42:51 -0700 (PDT) Received: from localhost ([109.224.133.37]) by mx.google.com with ESMTPS id w7sm17852839wiz.0.2012.09.14.01.42.49 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 14 Sep 2012 01:42:50 -0700 (PDT) From: Stefan Hajnoczi To: Anthony Liguori Date: Fri, 14 Sep 2012 09:42:21 +0100 Message-Id: <1347612146-5407-8-git-send-email-stefanha@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1347612146-5407-1-git-send-email-stefanha@gmail.com> References: <1347612146-5407-1-git-send-email-stefanha@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 74.125.82.173 Cc: qemu-devel@nongnu.org, Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 07/12] Fix copy&paste typos in documentation comments 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 From: BALATON Zoltan Signed-off-by: BALATON Zoltan Signed-off-by: Stefan Hajnoczi --- memory.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/memory.h b/memory.h index bd1bbae..f6c8e32 100644 --- a/memory.h +++ b/memory.h @@ -252,9 +252,9 @@ void memory_region_init_ram(MemoryRegion *mr, uint64_t size); /** - * memory_region_init_ram: Initialize RAM memory region from a user-provided. - * pointer. Accesses into the region will modify - * memory directly. + * memory_region_init_ram_ptr: Initialize RAM memory region from a + * user-provided pointer. Accesses into the + * region will modify memory directly. * * @mr: the #MemoryRegion to be initialized. * @name: the name of the region. @@ -581,7 +581,8 @@ void memory_region_add_subregion(MemoryRegion *mr, target_phys_addr_t offset, MemoryRegion *subregion); /** - * memory_region_add_subregion: Add a subregion to a container, with overlap. + * memory_region_add_subregion_overlap: Add a subregion to a container + * with overlap. * * Adds a subregion at @offset. The subregion may overlap with other * subregions. Conflicts are resolved by having a higher @priority hide a @@ -743,7 +744,7 @@ void memory_listener_unregister(MemoryListener *listener); void memory_global_dirty_log_start(void); /** - * memory_global_dirty_log_stop: begin dirty logging for all regions + * memory_global_dirty_log_stop: end dirty logging for all regions */ void memory_global_dirty_log_stop(void);