On Fri, 14 Apr 2017, Stefano Stabellini wrote: > Hi Paul, > > The following commit in my qemu "next" branch breaks the build on arm > and arm64: > > commit 670271647ad15e9d937ced7a72c892349c709216 > Author: Paul Durrant <paul.durr...@citrix.com> > Date: Tue Mar 7 10:55:34 2017 +0000 > > xen: use libxendevicemodel when available > > See the appended build log. Sorry for not realizing it sooner.
As I imagined, this bug is easy to solve. It is reproducible on x86 too, if you pass -DXC_WANT_COMPAT_DEVICEMODEL_API=1 to configure and forcefully disable Xen 4.9 detection in the configure script. If QEMU detects xen_ctrl_version = 480, the build will fail against Xen 4.9, even when -DXC_WANT_COMPAT_DEVICEMODEL_API=1 is specified. The appended patch solves the problem. However, Xen 4.9 detection and compilation remain broken. --- diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h index 274accc..b1f5f53 100644 --- a/include/hw/xen/xen_common.h +++ b/include/hw/xen/xen_common.h @@ -9,7 +9,6 @@ #undef XC_WANT_COMPAT_EVTCHN_API #undef XC_WANT_COMPAT_GNTTAB_API #undef XC_WANT_COMPAT_MAP_FOREIGN_API -#undef XC_WANT_COMPAT_DEVICEMODEL_API #include <xenctrl.h> #include <xenstore.h> @@ -154,6 +153,7 @@ static inline int xendevicemodel_set_mem_type( #else /* CONFIG_XEN_CTRL_INTERFACE_VERSION >= 490 */ +#undef XC_WANT_COMPAT_DEVICEMODEL_API #include <xendevicemodel.h> #endif _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel