On 9/12/23 15:32, Paolo Bonzini wrote:
A misspelled condition in xen_native.h is hiding a bug in the enablement of
Xen for qemu-system-aarch64. The bug becomes apparent when building for
Xen 4.18.
This looks like 2 issue, first meson, then
CONFIG_XEN_CTRL_INTERFACE_VERSION (the superseded patch).
While the i386 emulator provides the xenpv machine type for multiple
architectures,
and therefore can be compiled with Xen enabled even when the host is Arm, the
opposite is not true: qemu-system-aarch64 can only be compiled with Xen support
enabled when the host is Arm.
Expand the computation of accelerator_targets['CONFIG_XEN'] similar to what is
already there for KVM, and fix xen_native.h.
Cc: Stefano Stabellini <stefano.stabell...@amd.com>
Cc: Richard W.M. Jones <rjo...@redhat.com>
Cc: Daniel P. Berrangé <berra...@redhat.com>
Reported-by: Michael Young <m.a.yo...@durham.ac.uk>
Supersedes:
<277e21fc78b75ec459efc7f5fde628a0222c63b0.1701989261.git.m.a.yo...@durham.ac.uk>
(strip the Supersedes: tag)
Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
---
include/hw/xen/xen_native.h | 2 +-
meson.build | 17 ++++++++++-------
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/include/hw/xen/xen_native.h b/include/hw/xen/xen_native.h
index 6f09c48823b..1a5ad693a4d 100644
--- a/include/hw/xen/xen_native.h
+++ b/include/hw/xen/xen_native.h
@@ -532,7 +532,7 @@ static inline int
xendevicemodel_set_irq_level(xendevicemodel_handle *dmod,
}
#endif
-#if CONFIG_XEN_CTRL_INTERFACE_VERSION <= 41700
+#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 41700
I don't know about this, but for the rest (meson):
Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org>
