[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/7] include/exec/poison: Mark CONFIG_SOFTMMU as poi
From: |
Thomas Huth |
Subject: |
[Qemu-devel] [PATCH 6/7] include/exec/poison: Mark CONFIG_SOFTMMU as poisoned |
Date: |
Fri, 16 Jun 2017 16:59:12 +0200 |
CONFIG_SOFTMMU should never be used in common code, so mark
it as poisoned, too.
Signed-off-by: Thomas Huth <address@hidden>
---
include/exec/poison.h | 1 +
include/qom/cpu.h | 8 ++++++++
2 files changed, 9 insertions(+)
diff --git a/include/exec/poison.h b/include/exec/poison.h
index 540fc70..c932d6f 100644
--- a/include/exec/poison.h
+++ b/include/exec/poison.h
@@ -81,6 +81,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 89ddb68..c41e1e3 100644
--- a/include/qom/cpu.h
+++ b/include/qom/cpu.h
@@ -783,6 +783,8 @@ bool cpu_throttle_active(void);
*/
int cpu_throttle_get_percentage(void);
+#ifdef NEED_CPU_H
+
#ifndef CONFIG_USER_ONLY
typedef void (*CPUInterruptHandler)(CPUState *, int);
@@ -829,6 +831,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.
@@ -1005,6 +1009,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
@@ -1019,6 +1025,8 @@ extern const struct VMStateDescription vmstate_cpu_common;
.offset = 0, \
}
+#endif /* NEED_CPU_H */
+
#define UNASSIGNED_CPU_INDEX -1
#endif
--
1.8.3.1
- [Qemu-devel] [PATCH v2 0/7] Poison some more target-specific defines, Thomas Huth, 2017/06/16
- [Qemu-devel] [PATCH 1/7] include/exec/poison: Add missing TARGET defines, Thomas Huth, 2017/06/16
- [Qemu-devel] [PATCH 2/7] include/exec/poison: Mark some CONFIG defines as poisoned, too, Thomas Huth, 2017/06/16
- [Qemu-devel] [PATCH 3/7] Move CONFIG_KVM related definitions to kvm_i386.h, Thomas Huth, 2017/06/16
- [Qemu-devel] [PATCH 4/7] include/exec/poison: Mark CONFIG_KVM as poisoned, too, Thomas Huth, 2017/06/16
- [Qemu-devel] [PATCH 5/7] cpu: Introduce a wrapper for tlb_flush() that can be used in common code, Thomas Huth, 2017/06/16
- [Qemu-devel] [PATCH 7/7] Makefile: Move bootdevice.o to common-obj-y, Thomas Huth, 2017/06/16
- [Qemu-devel] [PATCH 6/7] include/exec/poison: Mark CONFIG_SOFTMMU as poisoned,
Thomas Huth <=
- Re: [Qemu-devel] [PATCH v2 0/7] Poison some more target-specific defines, Paolo Bonzini, 2017/06/16