8e0ef06894
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>
49 lines
1.0 KiB
C
49 lines
1.0 KiB
C
/*
|
|
* QEMU Xen support
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
* See the COPYING file in the top-level directory.
|
|
*/
|
|
|
|
#ifndef SYSEMU_XEN_H
|
|
#define SYSEMU_XEN_H
|
|
|
|
#ifdef NEED_CPU_H
|
|
# ifdef CONFIG_XEN
|
|
# define CONFIG_XEN_IS_POSSIBLE
|
|
# endif
|
|
#else
|
|
# define CONFIG_XEN_IS_POSSIBLE
|
|
#endif
|
|
|
|
#ifdef CONFIG_XEN_IS_POSSIBLE
|
|
|
|
extern bool xen_allowed;
|
|
|
|
#define xen_enabled() (xen_allowed)
|
|
|
|
#ifndef CONFIG_USER_ONLY
|
|
void xen_hvm_modified_memory(ram_addr_t start, ram_addr_t length);
|
|
void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size,
|
|
struct MemoryRegion *mr, Error **errp);
|
|
#endif
|
|
|
|
#else /* !CONFIG_XEN_IS_POSSIBLE */
|
|
|
|
#define xen_enabled() 0
|
|
#ifndef CONFIG_USER_ONLY
|
|
static inline void xen_hvm_modified_memory(ram_addr_t start, ram_addr_t length)
|
|
{
|
|
/* nothing */
|
|
}
|
|
static inline void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size,
|
|
MemoryRegion *mr, Error **errp)
|
|
{
|
|
g_assert_not_reached();
|
|
}
|
|
#endif
|
|
|
|
#endif /* CONFIG_XEN_IS_POSSIBLE */
|
|
|
|
#endif
|