[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 13/49] exec: remove non-TCG stuff from exec-all.h hea
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 13/49] exec: remove non-TCG stuff from exec-all.h header. |
Date: |
Fri, 16 Oct 2015 10:49:35 +0200 |
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 <address@hidden>
---
include/exec/exec-all.h | 6 ------
include/exec/ram_addr.h | 1 +
include/sysemu/cpus.h | 1 +
include/sysemu/kvm.h | 4 ++++
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h
index 4e8afbf..9b93b9b 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 c400a75..3360ac5 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
diff --git a/include/sysemu/cpus.h b/include/sysemu/cpus.h
index 3f162a9..30ddd12 100644
--- a/include/sysemu/cpus.h
+++ b/include/sysemu/cpus.h
@@ -2,6 +2,7 @@
#define QEMU_CPUS_H
/* cpus.c */
+bool qemu_in_vcpu_thread(void);
void qemu_init_cpu_loop(void);
void resume_all_vcpus(void);
void pause_all_vcpus(void);
diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
index 2a58b4d..52c57e2 100644
--- a/include/sysemu/kvm.h
+++ b/include/sysemu/kvm.h
@@ -210,6 +210,10 @@ int kvm_set_signal_mask(CPUState *cpu, const sigset_t
*sigset);
int kvm_on_sigbus_vcpu(CPUState *cpu, int code, void *addr);
int kvm_on_sigbus(int code, void *addr);
+/* interface with exec.c */
+
+void phys_mem_set_alloc(void *(*alloc)(size_t, uint64_t *align));
+
/* internal API */
int kvm_ioctl(KVMState *s, int type, ...);
--
2.5.0
- [Qemu-devel] [PULL 02/49] scsi: switch from g_slice allocator to malloc, (continued)
- [Qemu-devel] [PULL 02/49] scsi: switch from g_slice allocator to malloc, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 03/49] megasas: fix megasas_get_sata_addr, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 06/49] cpu-exec-common.c: Clarify comment about cpu_reload_memory_map()'s RCU operations, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 04/49] configure: Require Python 2.6, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 05/49] exec.c: Don't call cpu_reload_memory_map() from cpu_exec_init(), Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 07/49] exec.c: Collect AddressSpace related fields into a CPUAddressSpace struct, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 09/49] linux-headers: update from kvm/next, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 08/49] checkpatch: allow open braces on typedef lines, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 10/49] target-i386/kvm: Hyper-V HV_X64_MSR_RESET support, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 11/49] target-i386/kvm: set Hyper-V features cpuid bit HV_X64_MSR_VP_INDEX_AVAILABLE, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 13/49] exec: remove non-TCG stuff from exec-all.h header.,
Paolo Bonzini <=
- [Qemu-devel] [PULL 12/49] target-i386/kvm: Hyper-V HV_X64_MSR_VP_RUNTIME support, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 14/49] kvm-all: Align to qemu_real_host_page_size in kvm_set_phys_mem, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 15/49] checkpatch: port fix from kernel "## is not a valid modifier", Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 16/49] MAINTAINERS: add two devices to the e500 section, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 18/49] MAINTAINERS: Add more pxa2xx files and boards, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 19/49] MAINTAINERS: Add maintainer for ARM PrimeCell and integrated devices, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 21/49] qemu-sockets: fix conversion of ipv4/ipv6 JSON to QemuOpts, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 20/49] MAINTAINERS: Add more devices to realview board, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 26/49] qemu-char: convert file backend to data-driven creation, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 25/49] qemu-char: add create to register_char_driver, Paolo Bonzini, 2015/10/16