summary refs log tree commit diff stats
path: root/accel/xen/xen-all.c
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé <philmd@redhat.com>2020-08-04 09:49:30 +0200
committerAnthony PERARD <anthony.perard@citrix.com>2020-08-04 10:21:35 +0100
commit8e0ef068942e4152f0d23e76ca1f5e35dc4456f7 (patch)
treeb3ab0c03de41ff59cf2e3ed18bf9bffff60acadd /accel/xen/xen-all.c
parent5c1c3e4f02e458cf280c677c817ae4fd1ed9bf10 (diff)
downloadfocaccia-qemu-8e0ef068942e4152f0d23e76ca1f5e35dc4456f7.tar.gz
focaccia-qemu-8e0ef068942e4152f0d23e76ca1f5e35dc4456f7.zip
accel/xen: Fix xen_enabled() behavior on target-agnostic objects
CONFIG_XEN is generated by configure and stored in "config-target.h",
which is (obviously) only include for target-specific objects.
This is a problem for target-agnostic objects as CONFIG_XEN is never
defined and xen_enabled() is always inlined as 'false'.

Fix by following the KVM schema, defining CONFIG_XEN_IS_POSSIBLE
when we don't know to force the call of the non-inlined function,
returning the xen_allowed boolean.

Fixes: da278d58a092 ("accel: Move Xen accelerator code under accel/xen/")
Reported-by: Paul Durrant <pdurrant@amazon.com>
Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Paul Durrant <paul@xen.org>
Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>
Message-Id: <20200804074930.13104-2-philmd@redhat.com>
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Diffstat (limited to 'accel/xen/xen-all.c')
-rw-r--r--accel/xen/xen-all.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/accel/xen/xen-all.c b/accel/xen/xen-all.c
index 0c24d4b191..60b971d0a8 100644
--- a/accel/xen/xen-all.c
+++ b/accel/xen/xen-all.c
@@ -32,12 +32,7 @@
     do { } while (0)
 #endif
 
-static bool xen_allowed;
-
-bool xen_enabled(void)
-{
-    return xen_allowed;
-}
+bool xen_allowed;
 
 xc_interface *xen_xc;
 xenforeignmemory_handle *xen_fmem;