From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51422) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9ced-00024X-8c for qemu-devel@nongnu.org; Thu, 17 Dec 2015 12:47:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a9ceb-000708-UJ for qemu-devel@nongnu.org; Thu, 17 Dec 2015 12:47:51 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43709) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9ceb-000702-Or for qemu-devel@nongnu.org; Thu, 17 Dec 2015 12:47:49 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 5F92D694 for ; Thu, 17 Dec 2015 17:47:49 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-112-23.ams2.redhat.com [10.36.112.23]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tBHHkfce014618 for ; Thu, 17 Dec 2015 12:47:48 -0500 From: Paolo Bonzini Date: Thu, 17 Dec 2015 18:46:34 +0100 Message-Id: <1450374401-31352-39-git-send-email-pbonzini@redhat.com> In-Reply-To: <1450374401-31352-1-git-send-email-pbonzini@redhat.com> References: <1450374401-31352-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 38/45] memory: inline a few small accessors List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org These are used in the address_space_* fast paths. Signed-off-by: Paolo Bonzini --- include/exec/memory.h | 22 ++++++++++++++++++---- memory.c | 20 -------------------- 2 files changed, 18 insertions(+), 24 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index 3680d6a..a0993e5 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -523,7 +523,10 @@ uint64_t memory_region_size(MemoryRegion *mr); * * @mr: the memory region being queried */ -bool memory_region_is_ram(MemoryRegion *mr); +static inline bool memory_region_is_ram(MemoryRegion *mr) +{ + return mr->ram; +} /** * memory_region_is_skip_dump: check whether a memory region should not be @@ -563,7 +566,11 @@ static inline bool memory_region_is_romd(MemoryRegion *mr) * * @mr: the memory region being queried */ -bool memory_region_is_iommu(MemoryRegion *mr); +static inline bool memory_region_is_iommu(MemoryRegion *mr) +{ + return mr->iommu_ops; +} + /** * memory_region_notify_iommu: notify a change in an IOMMU translation entry. @@ -645,7 +652,11 @@ uint8_t memory_region_get_dirty_log_mask(MemoryRegion *mr); * * @mr: the memory region being queried */ -bool memory_region_is_rom(MemoryRegion *mr); +static inline bool memory_region_is_rom(MemoryRegion *mr) +{ + return mr->ram && mr->readonly; +} + /** * memory_region_get_fd: Get a file descriptor backing a RAM memory region. @@ -970,7 +981,10 @@ void memory_region_add_subregion_overlap(MemoryRegion *mr, * DO NOT USE THIS FUNCTION. This is a temporary workaround while the Xen * code is being reworked. */ -ram_addr_t memory_region_get_ram_addr(MemoryRegion *mr); +static inline ram_addr_t memory_region_get_ram_addr(MemoryRegion *mr) +{ + return mr->ram_addr; +} uint64_t memory_region_get_alignment(const MemoryRegion *mr); /** diff --git a/memory.c b/memory.c index b4d2b52..93bd8ed 100644 --- a/memory.c +++ b/memory.c @@ -1403,11 +1403,6 @@ const char *memory_region_name(const MemoryRegion *mr) return mr->name; } -bool memory_region_is_ram(MemoryRegion *mr) -{ - return mr->ram; -} - bool memory_region_is_skip_dump(MemoryRegion *mr) { return mr->skip_dump; @@ -1427,16 +1422,6 @@ bool memory_region_is_logging(MemoryRegion *mr, uint8_t client) return memory_region_get_dirty_log_mask(mr) & (1 << client); } -bool memory_region_is_rom(MemoryRegion *mr) -{ - return mr->ram && mr->readonly; -} - -bool memory_region_is_iommu(MemoryRegion *mr) -{ - return mr->iommu_ops; -} - void memory_region_register_iommu_notifier(MemoryRegion *mr, Notifier *n) { notifier_list_add(&mr->iommu_notify, n); @@ -1928,11 +1913,6 @@ void memory_region_set_alias_offset(MemoryRegion *mr, hwaddr offset) memory_region_transaction_commit(); } -ram_addr_t memory_region_get_ram_addr(MemoryRegion *mr) -{ - return mr->ram_addr; -} - uint64_t memory_region_get_alignment(const MemoryRegion *mr) { return mr->align; -- 2.5.0