Commit 1619d1fe authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

memory: inline a few small accessors 



These are used in the address_space_* fast paths.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent a203ac70

include/exec/memory.h

+18 −4
Original line number Diff line number Diff line
@@ -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);

/**

memory.c

+0 −20
Original line number Diff line number Diff line
@@ -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;