summaryrefslogtreecommitdiff
path: root/include/exec
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2015-08-11 10:52:46 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2015-10-12 18:29:26 +0200
commit88401cbc5b5730986fd5040425f5015a9cce9080 (patch)
tree3743534ef3ba8e61082d77d1e1544f53c89f9f1f /include/exec
parent46eb8f98f2ce402e384d60ddd15020720994c7ca (diff)
exec: remove non-TCG stuff from exec-all.h header.
The header is included from basically everywhere, thanks to cpu.h. It should be moved to the (TCG only) files that actually need it. As a start, remove non-TCG stuff. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'include/exec')
-rw-r--r--include/exec/exec-all.h6
-rw-r--r--include/exec/ram_addr.h1
2 files changed, 1 insertions, 6 deletions
diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h
index 4e8afbfd47..9b93b9b47d 100644
--- a/include/exec/exec-all.h
+++ b/include/exec/exec-all.h
@@ -84,7 +84,6 @@ void QEMU_NORETURN cpu_loop_exit(CPUState *cpu);
void QEMU_NORETURN cpu_loop_exit_restore(CPUState *cpu, uintptr_t pc);
#if !defined(CONFIG_USER_ONLY)
-bool qemu_in_vcpu_thread(void);
void cpu_reloading_memory_map(void);
void tcg_cpu_address_space_init(CPUState *cpu, AddressSpace *as);
/* cputlb.c */
@@ -357,8 +356,6 @@ extern uintptr_t tci_tb_ptr;
#if !defined(CONFIG_USER_ONLY)
-void phys_mem_set_alloc(void *(*alloc)(size_t, uint64_t *align));
-
struct MemoryRegion *iotlb_to_region(CPUState *cpu,
hwaddr index);
@@ -408,7 +405,4 @@ extern int singlestep;
extern CPUState *tcg_current_cpu;
extern bool exit_request;
-#if !defined(CONFIG_USER_ONLY)
-void migration_bitmap_extend(ram_addr_t old, ram_addr_t new);
-#endif
#endif
diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h
index c400a75a6a..3360ac5fde 100644
--- a/include/exec/ram_addr.h
+++ b/include/exec/ram_addr.h
@@ -289,5 +289,6 @@ uint64_t cpu_physical_memory_sync_dirty_bitmap(unsigned long *dest,
return num_dirty;
}
+void migration_bitmap_extend(ram_addr_t old, ram_addr_t new);
#endif
#endif