From patchwork Tue Aug 5 05:56:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hu Tao X-Patchwork-Id: 376558 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id A3AA114009C for ; Tue, 5 Aug 2014 15:59:45 +1000 (EST) Received: from localhost ([::1]:56730 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XEXmh-0004v4-RE for incoming@patchwork.ozlabs.org; Tue, 05 Aug 2014 01:59:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57924) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XEXm3-0003dm-5O for qemu-devel@nongnu.org; Tue, 05 Aug 2014 01:59:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XEXlx-0002oS-31 for qemu-devel@nongnu.org; Tue, 05 Aug 2014 01:59:03 -0400 Received: from [59.151.112.132] (port=15360 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XEXlw-0002mA-NT for qemu-devel@nongnu.org; Tue, 05 Aug 2014 01:58:57 -0400 X-IronPort-AV: E=Sophos;i="5.04,267,1406563200"; d="scan'208";a="34190845" Received: from unknown (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 05 Aug 2014 13:56:02 +0800 Received: from G08CNEXCHPEKD03.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id s755wniC019013; Tue, 5 Aug 2014 13:58:49 +0800 Received: from G08FNSTD100614.fnst.cn.fujitsu.com (10.167.226.102) by G08CNEXCHPEKD03.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Tue, 5 Aug 2014 13:58:53 +0800 From: Hu Tao To: Date: Tue, 5 Aug 2014 13:56:31 +0800 Message-ID: X-Mailer: git-send-email 1.9.3 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.167.226.102] X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Cc: Paolo Bonzini , "Michael S. Tsirkin" Subject: [Qemu-devel] [PATCH v4 4/6] rename memory_region_init_ram_may_fail to memory_region_init_ram 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 Signed-off-by: Hu Tao --- backends/hostmem-ram.c | 4 ++-- include/exec/memory.h | 15 +++++++-------- memory.c | 12 ++++++------ 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/backends/hostmem-ram.c b/backends/hostmem-ram.c index d0e92ad..a67a134 100644 --- a/backends/hostmem-ram.c +++ b/backends/hostmem-ram.c @@ -26,8 +26,8 @@ ram_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) } path = object_get_canonical_path_component(OBJECT(backend)); - memory_region_init_ram_may_fail(&backend->mr, OBJECT(backend), path, - backend->size, errp); + memory_region_init_ram(&backend->mr, OBJECT(backend), path, + backend->size, errp); g_free(path); } diff --git a/include/exec/memory.h b/include/exec/memory.h index c0a19e7..bc795cf 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -304,9 +304,8 @@ void memory_region_init_io(MemoryRegion *mr, uint64_t size); /** - * memory_region_init_ram_may_fail: Initialize RAM memory region. Accesses - * into the region will modify memory - * directly. + * memory_region_init_ram: Initialize RAM memory region. Accesses + * into the region will modify memory directly. * * @mr: the #MemoryRegion to be initialized. * @owner: the object that tracks the region's reference count @@ -314,11 +313,11 @@ void memory_region_init_io(MemoryRegion *mr, * @size: size of the region. * @errp: pointer to Error*, to store an error if it happens. */ -void memory_region_init_ram_may_fail(MemoryRegion *mr, - struct Object *owner, - const char *name, - uint64_t size, - Error **errp); +void memory_region_init_ram(MemoryRegion *mr, + struct Object *owner, + const char *name, + uint64_t size, + Error **errp); /** * memory_region_init_ram_nofail: Initialize RAM memory region. Accesses into diff --git a/memory.c b/memory.c index 7bc7d59..fb47b5d 100644 --- a/memory.c +++ b/memory.c @@ -1161,11 +1161,11 @@ void memory_region_init_io(MemoryRegion *mr, mr->ram_addr = ~(ram_addr_t)0; } -void memory_region_init_ram_may_fail(MemoryRegion *mr, - Object *owner, - const char *name, - uint64_t size, - Error **errp) +void memory_region_init_ram(MemoryRegion *mr, + Object *owner, + const char *name, + uint64_t size, + Error **errp) { memory_region_init(mr, owner, name, size); mr->ram = true; @@ -1181,7 +1181,7 @@ void memory_region_init_ram_nofail(MemoryRegion *mr, { Error *local_err = NULL; - memory_region_init_ram_may_fail(mr, owner, name, size, &local_err); + memory_region_init_ram(mr, owner, name, size, &local_err); if (local_err) { error_report("%s", error_get_pretty(local_err));