ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

include/exec/poison: Mark CONFIG_SOFTMMU as poisoned 

CONFIG_SOFTMMU should never be used in common code, so mark
it as poisoned, too.

Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <1498454578-18709-6-git-send-email-thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Thomas Huth 2017-06-26 07:22:56 +02:00 committed by Paolo Bonzini
parent 2cd5394311
commit 47507383c6
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/exec/poison.h
View File

@ -87,6 +87,7 @@
#pragma GCC poison CONFIG_LINUX_USER #pragma GCC poison CONFIG_LINUX_USER
#pragma GCC poison CONFIG_VHOST_NET #pragma GCC poison CONFIG_VHOST_NET
#pragma GCC poison CONFIG_KVM #pragma GCC poison CONFIG_KVM
#pragma GCC poison CONFIG_SOFTMMU
#endif #endif
#endif #endif

8
include/qom/cpu.h
View File

@ -817,6 +817,8 @@ void cpu_interrupt(CPUState *cpu, int mask);
#endif /* USER_ONLY */ #endif /* USER_ONLY */
#ifdef NEED_CPU_H
#ifdef CONFIG_SOFTMMU #ifdef CONFIG_SOFTMMU
static inline void cpu_unassigned_access(CPUState *cpu, hwaddr addr, static inline void cpu_unassigned_access(CPUState *cpu, hwaddr addr,
bool is_write, bool is_exec, bool is_write, bool is_exec,
@ -839,6 +841,8 @@ static inline void cpu_unaligned_access(CPUState *cpu, vaddr addr,
} }
#endif #endif
#endif /* NEED_CPU_H */
/** /**
* cpu_set_pc: * cpu_set_pc:
* @cpu: The CPU to set the program counter for. * @cpu: The CPU to set the program counter for.
@ -1015,6 +1019,8 @@ void cpu_exec_initfn(CPUState *cpu);
void cpu_exec_realizefn(CPUState *cpu, Error **errp); void cpu_exec_realizefn(CPUState *cpu, Error **errp);
void cpu_exec_unrealizefn(CPUState *cpu); void cpu_exec_unrealizefn(CPUState *cpu);
#ifdef NEED_CPU_H
#ifdef CONFIG_SOFTMMU #ifdef CONFIG_SOFTMMU
extern const struct VMStateDescription vmstate_cpu_common; extern const struct VMStateDescription vmstate_cpu_common;
#else #else
@ -1029,6 +1035,8 @@ extern const struct VMStateDescription vmstate_cpu_common;
.offset = 0, \ .offset = 0, \
} }
#endif /* NEED_CPU_H */
#define UNASSIGNED_CPU_INDEX -1 #define UNASSIGNED_CPU_INDEX -1
#endif #endif