diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-06-28 11:48:09 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-06-28 11:48:09 -0500 |
| commit | 8a9c98aedc1a3fb4dfbebeccc926e273df54f2ba (patch) | |
| tree | b800dd8b6131717bf397103ec4d7199f67ea0c5c /include/qemu-common.h | |
| parent | 36125631e79d53ffb9365740f43f386e2171d116 (diff) | |
| parent | c658b94f6e8c206c59d02aa6fbac285b86b53d2c (diff) | |
Merge remote-tracking branch 'afaerber/qom-cpu' into staging
# By Andreas Färber
# Via Andreas Färber
* afaerber/qom-cpu: (24 commits)
cpu: Turn cpu_unassigned_access() into a CPUState hook
hwaddr: Make hwaddr type usable beyond softmmu
cpu: Change qemu_init_vcpu() argument to CPUState
cpus: Change qemu_dummy_start_vcpu() argument to CPUState
cpus: Change qemu_kvm_start_vcpu() argument to CPUState
cpus: Change cpu_handle_guest_debug() argument to CPUState
gdbstub: Set gdb_set_stop_cpu() argument to CPUState
kvm: Change kvm_cpu_exec() argument to CPUState
kvm: Change kvm_handle_internal_error() argument to CPUState
cpu: Turn cpu_dump_{state,statistics}() into CPUState hooks
cpus: Change qemu_kvm_init_cpu_signals() argument to CPUState
kvm: Change kvm_set_signal_mask() argument to CPUState
cpus: Change qemu_kvm_wait_io_event() argument to CPUState
cpus: Change cpu_thread_is_idle() argument to CPUState
cpu: Change cpu_exit() argument to CPUState
kvm: Change cpu_synchronize_state() argument to CPUState
kvm: Change kvm_cpu_synchronize_state() argument to CPUState
gdbstub: Simplify find_cpu()
cpu: Guard cpu_{save,load}() definitions
target-openrisc: Register VMStateDescription for OpenRISCCPU
...
Diffstat (limited to 'include/qemu-common.h')
| -rw-r--r-- | include/qemu-common.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/include/qemu-common.h b/include/qemu-common.h index 3c913758c9..f4397388f5 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -279,8 +279,10 @@ bool tcg_enabled(void); void cpu_exec_init_all(void); /* CPU save/load. */ +#ifdef CPU_SAVE_VERSION void cpu_save(QEMUFile *f, void *opaque); int cpu_load(QEMUFile *f, void *opaque, int version_id); +#endif /* Unblock cpu */ void qemu_cpu_kick_self(void); @@ -293,14 +295,6 @@ struct qemu_work_item { int done; }; -#ifdef CONFIG_USER_ONLY -static inline void qemu_init_vcpu(void *env) -{ -} -#else -void qemu_init_vcpu(void *env); -#endif - /** * Sends a (part of) iovec down a socket, yielding when the socket is full, or |