On 23/09/2020 06:24, Juergen Gross wrote:
> xenguest.h includes xenctrl_dom.h, which is including the Xen internal
> xen/libelf/libelf.h. This results in build failures for components
> using libxenguest when being built outside the Xen build environment.
>
> Fix that by guarding the include of xenctrl_dom.h with
> "#ifdef __XEN_TOOLS_".
>
> Fixes: 7e0165c19387 ("tools/libxc: untangle libxenctrl from libxenguest")
> Reported-by: Andrew Cooper <andrew.coop...@citrix.com>
> Signed-off-by: Juergen Gross <jgr...@suse.com>
> ---
> tools/libs/guest/include/xenguest.h | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/tools/libs/guest/include/xenguest.h
> b/tools/libs/guest/include/xenguest.h
> index 4643384790..5cd502f644 100644
> --- a/tools/libs/guest/include/xenguest.h
> +++ b/tools/libs/guest/include/xenguest.h
> @@ -22,7 +22,9 @@
> #ifndef XENGUEST_H
> #define XENGUEST_H
>
> +#ifdef __XEN_TOOLS__
> #include <xenctrl_dom.h>
> +#endif
I have to admit that this doesn't feel right to put into a public header.
Can't we split xenctrl_dom in half and merge the relevant subsets into
xen{ctrl,guest}.h ?
~Andrew
