diff options
| author | Thomas Huth <thuth@redhat.com> | 2017-06-26 07:22:56 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2017-07-04 14:39:11 +0200 |
| commit | 47507383c663b48af28e1428f782df5caad39441 (patch) | |
| tree | 68a347ebbc00e9351bf5a7b0ca77f9dda489c344 | |
| parent | 2cd53943115be5118b5b2d4b80ee0a39c94c4f73 (diff) | |
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>
| -rw-r--r-- | include/exec/poison.h | 1 | ||||
| -rw-r--r-- | include/qom/cpu.h | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/include/exec/poison.h b/include/exec/poison.h index 32707cd54f..41cd2eb1d8 100644 --- a/include/exec/poison.h +++ b/include/exec/poison.h @@ -87,6 +87,7 @@ #pragma GCC poison CONFIG_LINUX_USER #pragma GCC poison CONFIG_VHOST_NET #pragma GCC poison CONFIG_KVM +#pragma GCC poison CONFIG_SOFTMMU #endif #endif diff --git a/include/qom/cpu.h b/include/qom/cpu.h index b9440b6a67..7bfd50cc32 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -817,6 +817,8 @@ void cpu_interrupt(CPUState *cpu, int mask); #endif /* USER_ONLY */ +#ifdef NEED_CPU_H + #ifdef CONFIG_SOFTMMU static inline void cpu_unassigned_access(CPUState *cpu, hwaddr addr, bool is_write, bool is_exec, @@ -839,6 +841,8 @@ static inline void cpu_unaligned_access(CPUState *cpu, vaddr addr, } #endif +#endif /* NEED_CPU_H */ + /** * cpu_set_pc: * @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_unrealizefn(CPUState *cpu); +#ifdef NEED_CPU_H + #ifdef CONFIG_SOFTMMU extern const struct VMStateDescription vmstate_cpu_common; #else @@ -1029,6 +1035,8 @@ extern const struct VMStateDescription vmstate_cpu_common; .offset = 0, \ } +#endif /* NEED_CPU_H */ + #define UNASSIGNED_CPU_INDEX -1 #endif |