cputlb: prepare private memory API for public consumption

[qemu.git] / cputlb.h

diff --git a/cputlb.h b/cputlb.h
index 0b0b764df96ed5544de52a24a241f7cfc5b61c32..80f9b66262b72a565c1ff84418234b23c0695baa 100644 (file)
--- a/cputlb.h
+++ b/cputlb.h
@@ -32,8 +32,8 @@ void tlb_set_dirty(CPUArchState *env, target_ulong vaddr);
 extern int tlb_flush_count;
 
 /* exec.c */
-target_phys_addr_t section_addr(MemoryRegionSection *section,
-                                target_phys_addr_t addr);
+target_phys_addr_t memory_region_section_addr(MemoryRegionSection *section,
+                                              target_phys_addr_t addr);
 void tb_flush_jmp_cache(CPUArchState *env, target_ulong addr);
 target_phys_addr_t memory_region_section_get_iotlb(CPUArchState *env,
                                                    MemoryRegionSection *section,
@@ -43,21 +43,9 @@ target_phys_addr_t memory_region_section_get_iotlb(CPUArchState *env,
                                                    target_ulong *address);
 bool memory_region_is_unassigned(MemoryRegion *mr);
 
-static inline bool is_ram_rom(MemoryRegionSection *s)
+static inline bool memory_region_is_romd(MemoryRegion *mr)
 {
-    return memory_region_is_ram(s->mr);
-}
-
-static inline bool is_romd(MemoryRegionSection *s)
-{
-    MemoryRegion *mr = s->mr;
-
     return mr->rom_device && mr->readable;
 }
-static inline bool is_ram_rom_romd(MemoryRegionSection *s)
-{
-    return is_ram_rom(s) || is_romd(s);
-}
-
 #endif
 #endif