Re: [PATCH v16 2/4] tools/include: move xc_bitops.h to xen-tools/bitops.h

[Anthony PERARD <anthony@xxxxxxxxxxxxxx>]

On Tue, Aug 12, 2025 at 10:30:45PM +0000, dmkhn@xxxxxxxxx wrote:
> diff --git a/tools/libs/guest/xg_dom_elfloader.c 
> b/tools/libs/guest/xg_dom_elfloader.c
> index f17930d98bf7..8531e90f8e21 100644
> --- a/tools/libs/guest/xg_dom_elfloader.c
> +++ b/tools/libs/guest/xg_dom_elfloader.c
> @@ -25,8 +25,9 @@
>  #include <stdarg.h>
>  #include <inttypes.h>
>  
> +#include <xen-tools/bitops.h>

It doesn't looks like xg_dom_elfloader.c is using anything from
bitops.h. The last use of it was probably removed in ed04ca95981f
("libelf: rewrite symtab/strtab loading")

> +
>  #include "xg_private.h"
> -#include "xc_bitops.h"
>  
>  #define XEN_VER "xen-3.0"
>  
> diff --git a/tools/libs/guest/xg_dom_hvmloader.c 
> b/tools/libs/guest/xg_dom_hvmloader.c
> index 39e1e5f579a7..0f569c20c522 100644
> --- a/tools/libs/guest/xg_dom_hvmloader.c
> +++ b/tools/libs/guest/xg_dom_hvmloader.c
> @@ -24,8 +24,9 @@
>  #include <inttypes.h>
>  #include <assert.h>
>  
> +#include <xen-tools/bitops.h>
> +

I think there's two reason to remove this include:
- it doesn't looks like xg_dom_hvmloader.c is using any macro from it.
- bitops.h is already included by xg_private.h.


>  #include "xg_private.h"
> -#include "xc_bitops.h"
>  
>  /* ------------------------------------------------------------------------ 
> */
>  /* parse elf binary                                                         
> */
> diff --git a/tools/libs/guest/xg_sr_common.h b/tools/libs/guest/xg_sr_common.h
> index 2f058ee3a6ff..2e583f2eac72 100644
> --- a/tools/libs/guest/xg_sr_common.h
> +++ b/tools/libs/guest/xg_sr_common.h
> @@ -2,11 +2,10 @@
>  #define __COMMON__H
>  
>  #include <stdbool.h>
> +#include <xen-tools/bitops.h>

It's already included in xg_private.h, so this feels unnecessary.
>  
>  #include "xg_private.h"
>  #include "xg_save_restore.h"
> -#include "xc_bitops.h"
> -


If the extraneous includes could be removed, that would be nice. In
anycase:
Acked-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>

Thanks,

-- 
Anthony PERARD