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(+)
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).
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 4cd3f8abb4..3250fc1d52 100644
--- a/include/exec/poison.h
+++ b/include/exec/poison.h
@@ -88,8 +88,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
On Tue, 16 Mar 2021 at 12:54, Thomas Huth <thuth@redhat.com> wrote: > > 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). > > 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 4cd3f8abb4..3250fc1d52 100644 > --- a/include/exec/poison.h > +++ b/include/exec/poison.h > @@ -88,8 +88,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 */ Now we only get hax_enabled() if NEED_CPU_H was defined (which is different behaviour from kvm_enabled()). I think we should structure all of these accel-specific headers the same way we do kvm.h: * if we're being included from non-target-specific code, or if we're in target-specific code and we know KVM is present, you get the versions that reference functions/bools/etc * if we're being included from target-specific code where we know KVM is not present there are macros that evaluate to always-false/always-fails * there's a stub file that proivdes the functions/bools for the KVM-not-actually-present case My argument here is basically consistency. We know already that the structure we use in kvm.h works, and it's the most solidly used/tested of the accelerators. Structuring the other accelerators differently for no particular reason is confusing to people trying to read or modify the code. thanks -- PMM
© 2016 - 2024 Red Hat, Inc.