[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 20/24] include/exec: Move cputlb exec.c defs out
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 20/24] include/exec: Move cputlb exec.c defs out |
Date: |
Wed, 16 Sep 2015 14:29:51 +0200 |
From: Peter Crosthwaite <address@hidden>
Move the architecture agnostic function prototypes for exec.c out of
cputlb.h to exec-all.h. This allows hiding of the arch specific
cputlb.h from exec.c which should be getting close to having no
architecture specifics. Prepares support for multi-arch, which will have
a minimal cpu.h that services exec.c but not cputlb.h.
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Peter Crosthwaite <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
exec.c | 1 -
include/exec/cputlb.h | 16 ----------------
include/exec/exec-all.h | 18 ++++++++++++++++++
3 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/exec.c b/exec.c
index f760f44..47ada31 100644
--- a/exec.c
+++ b/exec.c
@@ -49,7 +49,6 @@
#include "exec/cpu-all.h"
#include "qemu/rcu_queue.h"
#include "qemu/main-loop.h"
-#include "exec/cputlb.h"
#include "translate-all.h"
#include "exec/memory-internal.h"
diff --git a/include/exec/cputlb.h b/include/exec/cputlb.h
index 7ad5c9a..d454c00 100644
--- a/include/exec/cputlb.h
+++ b/include/exec/cputlb.h
@@ -25,23 +25,7 @@ void tlb_protect_code(ram_addr_t ram_addr);
void tlb_unprotect_code(ram_addr_t ram_addr);
void tlb_reset_dirty_range(CPUTLBEntry *tlb_entry, uintptr_t start,
uintptr_t length);
-void tlb_reset_dirty(CPUState *cpu, ram_addr_t start1, ram_addr_t length);
-void tlb_set_dirty(CPUState *cpu, target_ulong vaddr);
extern int tlb_flush_count;
-/* exec.c */
-void tb_flush_jmp_cache(CPUState *cpu, target_ulong addr);
-
-MemoryRegionSection *
-address_space_translate_for_iotlb(CPUState *cpu, hwaddr addr, hwaddr *xlat,
- hwaddr *plen);
-hwaddr memory_region_section_get_iotlb(CPUState *cpu,
- MemoryRegionSection *section,
- target_ulong vaddr,
- hwaddr paddr, hwaddr xlat,
- int prot,
- target_ulong *address);
-bool memory_region_is_unassigned(MemoryRegion *mr);
-
#endif
#endif
diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h
index 72d4012..a3719b7 100644
--- a/include/exec/exec-all.h
+++ b/include/exec/exec-all.h
@@ -388,6 +388,24 @@ static inline void mmap_unlock(void) {}
/* cputlb.c */
tb_page_addr_t get_page_addr_code(CPUArchState *env1, target_ulong addr);
+
+void tlb_reset_dirty(CPUState *cpu, ram_addr_t start1, ram_addr_t length);
+void tlb_set_dirty(CPUState *cpu, target_ulong vaddr);
+
+/* exec.c */
+void tb_flush_jmp_cache(CPUState *cpu, target_ulong addr);
+
+MemoryRegionSection *
+address_space_translate_for_iotlb(CPUState *cpu, hwaddr addr, hwaddr *xlat,
+ hwaddr *plen);
+hwaddr memory_region_section_get_iotlb(CPUState *cpu,
+ MemoryRegionSection *section,
+ target_ulong vaddr,
+ hwaddr paddr, hwaddr xlat,
+ int prot,
+ target_ulong *address);
+bool memory_region_is_unassigned(MemoryRegion *mr);
+
#endif
/* vl.c */
--
2.5.0
- [Qemu-devel] [PULL 09/24] monitor: remove target-specific code from monitor.c, (continued)
- [Qemu-devel] [PULL 09/24] monitor: remove target-specific code from monitor.c, Paolo Bonzini, 2015/09/16
- [Qemu-devel] [PULL 18/24] cputlb: move CPU_LOOP() for tlb_reset() to exec.c, Paolo Bonzini, 2015/09/16
- [Qemu-devel] [PULL 17/24] translate: move real_host_page setting to -common, Paolo Bonzini, 2015/09/16
- [Qemu-devel] [PULL 19/24] cputlb: Change tlb_set_dirty() arg to cpu, Paolo Bonzini, 2015/09/16
- [Qemu-devel] [PULL 21/24] monitor: uninclude cpu_ldst, Paolo Bonzini, 2015/09/16
- [Qemu-devel] [PULL 24/24] Revert "rcu: init rcu_registry_lock after fork", Paolo Bonzini, 2015/09/16
- [Qemu-devel] [PULL 22/24] checkpatch: Escape left braces in regex, Paolo Bonzini, 2015/09/16
- [Qemu-devel] [PULL 23/24] nbd: release exp->blk after all clients are closed, Paolo Bonzini, 2015/09/16
- [Qemu-devel] [PULL 20/24] include/exec: Move cputlb exec.c defs out,
Paolo Bonzini <=
- Re: [Qemu-devel] [PULL 00/24] Misc patches for 2015-09-16, Eric Blake, 2015/09/16
- Re: [Qemu-devel] [PULL 00/24] Misc patches for 2015-09-16, Peter Maydell, 2015/09/16