diff options
| author | Igor Mammedov <imammedo@redhat.com> | 2016-07-25 11:59:19 +0200 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2016-07-26 15:31:58 -0300 |
| commit | 1bc7e522d9cf1b58f2de9c8f1737be0bb5129c35 (patch) | |
| tree | 6b9b8bdba43cda1fd5dcd7e328d88b4230f46a41 | |
| parent | f49ee630d73729ecaeecf4b38a8df11bc613914d (diff) | |
exec: Reduce CONFIG_USER_ONLY ifdeffenery
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
| -rw-r--r-- | bsd-user/qemu.h | 2 | ||||
| -rw-r--r-- | exec.c | 17 | ||||
| -rw-r--r-- | include/exec/exec-all.h | 12 | ||||
| -rw-r--r-- | linux-user/qemu.h | 2 |
4 files changed, 15 insertions, 18 deletions
diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index 6ccc544e7d..2b2b9184e0 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -209,8 +209,6 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size, abi_ulong new_addr); int target_msync(abi_ulong start, abi_ulong len, int flags); extern unsigned long last_brk; -void cpu_list_lock(void); -void cpu_list_unlock(void); #if defined(CONFIG_USE_NPTL) void mmap_fork_start(void); void mmap_fork_end(int child); @@ -642,23 +642,17 @@ void cpu_exec_exit(CPUState *cpu) { CPUClass *cc = CPU_GET_CLASS(cpu); -#if defined(CONFIG_USER_ONLY) cpu_list_lock(); -#endif if (cpu->cpu_index == -1) { /* cpu_index was never allocated by this @cpu or was already freed. */ -#if defined(CONFIG_USER_ONLY) cpu_list_unlock(); -#endif return; } QTAILQ_REMOVE(&cpus, cpu, node); cpu_release_index(cpu); cpu->cpu_index = -1; -#if defined(CONFIG_USER_ONLY) cpu_list_unlock(); -#endif if (cc->vmsd != NULL) { vmstate_unregister(NULL, cc->vmsd, cpu); @@ -670,7 +664,7 @@ void cpu_exec_exit(CPUState *cpu) void cpu_exec_init(CPUState *cpu, Error **errp) { - CPUClass *cc = CPU_GET_CLASS(cpu); + CPUClass *cc ATTRIBUTE_UNUSED = CPU_GET_CLASS(cpu); Error *local_err = NULL; cpu->as = NULL; @@ -694,22 +688,17 @@ void cpu_exec_init(CPUState *cpu, Error **errp) object_ref(OBJECT(cpu->memory)); #endif -#if defined(CONFIG_USER_ONLY) cpu_list_lock(); -#endif cpu->cpu_index = cpu_get_free_index(&local_err); if (local_err) { error_propagate(errp, local_err); -#if defined(CONFIG_USER_ONLY) cpu_list_unlock(); -#endif return; } QTAILQ_INSERT_TAIL(&cpus, cpu, node); -#if defined(CONFIG_USER_ONLY) - (void) cc; cpu_list_unlock(); -#else + +#ifndef CONFIG_USER_ONLY if (qdev_get_vmsd(DEVICE(cpu)) == NULL) { vmstate_register(NULL, cpu->cpu_index, &vmstate_cpu_common, cpu); } diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index acda7b613d..d008296c1b 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -56,6 +56,18 @@ TranslationBlock *tb_gen_code(CPUState *cpu, target_ulong pc, target_ulong cs_base, uint32_t flags, int cflags); +#if defined(CONFIG_USER_ONLY) +void cpu_list_lock(void); +void cpu_list_unlock(void); +#else +static inline void cpu_list_unlock(void) +{ +} +static inline void cpu_list_lock(void) +{ +} +#endif + void cpu_exec_init(CPUState *cpu, Error **errp); void QEMU_NORETURN cpu_loop_exit(CPUState *cpu); void QEMU_NORETURN cpu_loop_exit_restore(CPUState *cpu, uintptr_t pc); diff --git a/linux-user/qemu.h b/linux-user/qemu.h index cdf23a723a..bef465de4d 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -419,8 +419,6 @@ int target_msync(abi_ulong start, abi_ulong len, int flags); extern unsigned long last_brk; extern abi_ulong mmap_next_start; abi_ulong mmap_find_vma(abi_ulong, abi_ulong); -void cpu_list_lock(void); -void cpu_list_unlock(void); void mmap_fork_start(void); void mmap_fork_end(int child); |