diff options
| author | Thomas Huth <thuth@redhat.com> | 2021-04-14 13:20:01 +0200 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2021-05-14 12:31:44 +0200 |
| commit | 13b48fb00e61dc7662da27c020c3263b74374acc (patch) | |
| tree | bf224ed53d0abd78b3e3eceb5f35d2c564a6fbd8 | |
| parent | bfaa3b05a9af6acd011e772fa42eff5d05424a35 (diff) | |
| download | qemu-13b48fb00e61dc7662da27c020c3263b74374acc.zip qemu-13b48fb00e61dc7662da27c020c3263b74374acc.tar.gz qemu-13b48fb00e61dc7662da27c020c3263b74374acc.tar.bz2 | |
include/sysemu: Poison all accelerator CONFIG switches in common code
We are already poisoning CONFIG_KVM since this switch is not working
in common code. Do the same with the other accelerator switches, too
(except for CONFIG_TCG, which is special, since it is also defined in
config-host.h).
Message-Id: <20210414112004.943383-2-thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
| -rw-r--r-- | include/exec/poison.h | 4 | ||||
| -rw-r--r-- | include/sysemu/hax.h | 4 | ||||
| -rw-r--r-- | include/sysemu/hvf.h | 4 | ||||
| -rw-r--r-- | include/sysemu/whpx.h | 4 |
4 files changed, 16 insertions, 0 deletions
diff --git a/include/exec/poison.h b/include/exec/poison.h index 8fc7530..a527def 100644 --- a/include/exec/poison.h +++ b/include/exec/poison.h @@ -83,8 +83,12 @@ #pragma GCC poison CONFIG_SPARC_DIS #pragma GCC poison CONFIG_XTENSA_DIS +#pragma GCC poison CONFIG_HAX +#pragma GCC poison CONFIG_HVF #pragma GCC poison CONFIG_LINUX_USER #pragma GCC poison CONFIG_KVM #pragma GCC poison CONFIG_SOFTMMU +#pragma GCC poison CONFIG_WHPX +#pragma GCC poison CONFIG_XEN #endif diff --git a/include/sysemu/hax.h b/include/sysemu/hax.h index 12fb54f..247f066 100644 --- a/include/sysemu/hax.h +++ b/include/sysemu/hax.h @@ -24,6 +24,8 @@ int hax_sync_vcpus(void); +#ifdef NEED_CPU_H + #ifdef CONFIG_HAX int hax_enabled(void); @@ -34,4 +36,6 @@ int hax_enabled(void); #endif /* CONFIG_HAX */ +#endif /* NEED_CPU_H */ + #endif /* QEMU_HAX_H */ diff --git a/include/sysemu/hvf.h b/include/sysemu/hvf.h index c98636b..bb70082 100644 --- a/include/sysemu/hvf.h +++ b/include/sysemu/hvf.h @@ -16,6 +16,8 @@ #include "qemu/accel.h" #include "qom/object.h" +#ifdef NEED_CPU_H + #ifdef CONFIG_HVF uint32_t hvf_get_supported_cpuid(uint32_t func, uint32_t idx, int reg); @@ -26,6 +28,8 @@ extern bool hvf_allowed; #define hvf_get_supported_cpuid(func, idx, reg) 0 #endif /* !CONFIG_HVF */ +#endif /* NEED_CPU_H */ + #define TYPE_HVF_ACCEL ACCEL_CLASS_NAME("hvf") typedef struct HVFState HVFState; diff --git a/include/sysemu/whpx.h b/include/sysemu/whpx.h index 8ca1c1c..2889fa2 100644 --- a/include/sysemu/whpx.h +++ b/include/sysemu/whpx.h @@ -13,6 +13,8 @@ #ifndef QEMU_WHPX_H #define QEMU_WHPX_H +#ifdef NEED_CPU_H + #ifdef CONFIG_WHPX int whpx_enabled(void); @@ -25,4 +27,6 @@ bool whpx_apic_in_platform(void); #endif /* CONFIG_WHPX */ +#endif /* NEED_CPU_H */ + #endif /* QEMU_WHPX_H */ |