From patchwork Sun Jul 10 18:14:19 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avi Kivity X-Patchwork-Id: 104075 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 2BB23B6F77 for ; Mon, 11 Jul 2011 04:42:20 +1000 (EST) Received: from localhost ([::1]:51964 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QfyxM-00027O-TX for incoming@patchwork.ozlabs.org; Sun, 10 Jul 2011 14:42:17 -0400 Received: from eggs.gnu.org ([140.186.70.92]:46956) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QfyXO-0004GX-UR for qemu-devel@nongnu.org; Sun, 10 Jul 2011 14:15:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QfyXF-0007Yn-5J for qemu-devel@nongnu.org; Sun, 10 Jul 2011 14:15:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37934) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QfyXD-0007W3-FU for qemu-devel@nongnu.org; Sun, 10 Jul 2011 14:15:15 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p6AIFEv9027497 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 10 Jul 2011 14:15:14 -0400 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p6AIFDed032722; Sun, 10 Jul 2011 14:15:13 -0400 Received: from s01.tlv.redhat.com (s01.tlv.redhat.com [10.35.255.8]) by cleopatra.tlv.redhat.com (Postfix) with ESMTP id 1B12D250B35; Sun, 10 Jul 2011 21:15:11 +0300 (IDT) From: Avi Kivity To: qemu-devel@nongnu.org Date: Sun, 10 Jul 2011 21:14:19 +0300 Message-Id: <1310321709-30770-7-git-send-email-avi@redhat.com> In-Reply-To: <1310321709-30770-1-git-send-email-avi@redhat.com> References: <1310321709-30770-1-git-send-email-avi@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 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] [RFC v3 06/56] memory: rename MemoryRegion::has_ram_addr to ::terminates 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 I/O regions will not have ram_addrs, so this is a better name. Signed-off-by: Avi Kivity --- memory.c | 18 +++++++++--------- memory.h | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/memory.c b/memory.c index 7187223..5fda4a0 100644 --- a/memory.c +++ b/memory.c @@ -244,7 +244,7 @@ static void render_memory_region(FlatView *view, render_memory_region(view, subregion, base, clip); } - if (!mr->has_ram_addr) { + if (!mr->terminates) { return; } @@ -366,7 +366,7 @@ void memory_region_init(MemoryRegion *mr, mr->size = size; mr->addr = 0; mr->offset = 0; - mr->has_ram_addr = false; + mr->terminates = false; mr->priority = 0; mr->may_overlap = false; mr->alias = NULL; @@ -521,7 +521,7 @@ void memory_region_init_io(MemoryRegion *mr, memory_region_init(mr, name, size); mr->ops = ops; mr->opaque = opaque; - mr->has_ram_addr = true; + mr->terminates = true; mr->ram_addr = cpu_register_io_memory(memory_region_read_thunk, memory_region_write_thunk, mr, @@ -534,7 +534,7 @@ void memory_region_init_ram(MemoryRegion *mr, uint64_t size) { memory_region_init(mr, name, size); - mr->has_ram_addr = true; + mr->terminates = true; mr->ram_addr = qemu_ram_alloc(dev, name, size); } @@ -545,7 +545,7 @@ void memory_region_init_ram_ptr(MemoryRegion *mr, void *ptr) { memory_region_init(mr, name, size); - mr->has_ram_addr = true; + mr->terminates = true; mr->ram_addr = qemu_ram_alloc_from_ptr(dev, name, size, ptr); } @@ -588,13 +588,13 @@ void memory_region_set_log(MemoryRegion *mr, bool log, unsigned client) bool memory_region_get_dirty(MemoryRegion *mr, target_phys_addr_t addr, unsigned client) { - assert(mr->has_ram_addr); + assert(mr->terminates); return cpu_physical_memory_get_dirty(mr->ram_addr + addr, 1 << client); } void memory_region_set_dirty(MemoryRegion *mr, target_phys_addr_t addr) { - assert(mr->has_ram_addr); + assert(mr->terminates); return cpu_physical_memory_set_dirty(mr->ram_addr + addr); } @@ -618,7 +618,7 @@ void memory_region_set_readonly(MemoryRegion *mr, bool readonly) void memory_region_reset_dirty(MemoryRegion *mr, target_phys_addr_t addr, target_phys_addr_t size, unsigned client) { - assert(mr->has_ram_addr); + assert(mr->terminates); cpu_physical_memory_reset_dirty(mr->ram_addr + addr, mr->ram_addr + addr + size, 1 << client); @@ -630,7 +630,7 @@ void *memory_region_get_ram_ptr(MemoryRegion *mr) return memory_region_get_ram_ptr(mr->alias) + mr->alias_offset; } - if (!mr->has_ram_addr) { + if (!mr->terminates) { abort(); } diff --git a/memory.h b/memory.h index 8873f75..2ad7202 100644 --- a/memory.h +++ b/memory.h @@ -77,7 +77,7 @@ struct MemoryRegion { target_phys_addr_t addr; target_phys_addr_t offset; ram_addr_t ram_addr; - bool has_ram_addr; + bool terminates; MemoryRegion *alias; target_phys_addr_t alias_offset; unsigned priority;