[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/10] include/sysemu: Poison all accelerator CONFIG switches in c
From: |
Thomas Huth |
Subject: |
[PULL 03/10] include/sysemu: Poison all accelerator CONFIG switches in common code |
Date: |
Mon, 3 May 2021 12:44:49 +0200 |
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>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
include/exec/poison.h | 4 ++++
include/sysemu/hax.h | 4 ++++
include/sysemu/hvf.h | 4 ++++
include/sysemu/whpx.h | 4 ++++
4 files changed, 16 insertions(+)
diff --git a/include/exec/poison.h b/include/exec/poison.h
index de972bfd8e..f769dcc781 100644
--- a/include/exec/poison.h
+++ b/include/exec/poison.h
@@ -86,8 +86,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 12fb54f990..247f0661d1 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 c98636bc81..bb70082e45 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 8ca1c1c4ac..2889fa2278 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 */
--
2.27.0
- [PULL 00/10] Gitlab-CI, qtest, moxie removal and misc patches, Thomas Huth, 2021/05/03
- [PULL 02/10] tests/docker/dockerfiles: Add ccache to containers where it was missing, Thomas Huth, 2021/05/03
- [PULL 03/10] include/sysemu: Poison all accelerator CONFIG switches in common code,
Thomas Huth <=
- [PULL 01/10] Remove the deprecated moxie target, Thomas Huth, 2021/05/03
- [PULL 04/10] gitlab-ci: Replace YAML anchors by extends (container_job), Thomas Huth, 2021/05/03
- [PULL 05/10] gitlab-ci: Replace YAML anchors by extends (native_build_job), Thomas Huth, 2021/05/03
- [PULL 06/10] gitlab-ci: Replace YAML anchors by extends (native_test_job), Thomas Huth, 2021/05/03
- [PULL 07/10] libqos/qgraph: fix "UNAVAILBLE" typo, Thomas Huth, 2021/05/03
- [PULL 08/10] docs/devel/qgraph: add troubleshooting information, Thomas Huth, 2021/05/03
- [PULL 10/10] util/compatfd.c: Replaced a malloc call with g_malloc., Thomas Huth, 2021/05/03
- [PULL 09/10] libqtest: refuse QTEST_QEMU_BINARY=qemu-kvm, Thomas Huth, 2021/05/03
- Re: [PULL 00/10] Gitlab-CI, qtest, moxie removal and misc patches, Peter Maydell, 2021/05/05