| Message ID | 20230609101105.2585951-1-andrew.cooper3@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | tools: Move MASK_INSR to common-macros.h | expand |
Urgh, well I'm failing at email today. This is v2. Everything else in the patch is as intended. ~Andrew On 09/06/2023 11:11 am, Andrew Cooper wrote: > MASK_EXTR() and MASK_INSR() are a matching pair. Keep them together. > > Drop the pair from x86-emulate.h which includes common-macros.h. > > Fixes: 56a7aaa16bfe ("tools: add physinfo arch_capabilities handling for Arm") > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> > --- > CC: Anthony PERARD <anthony.perard@citrix.com> > CC: Juergen Gross <jgross@suse.com> > CC: Luca Fancellu <luca.fancellu@arm.com> > CC: Jan Beulich <JBeulich@suse.com> > CC: Roger Pau Monné <roger.pau@citrix.com> > CC: Wei Liu <wl@xen.org> > > v2: > * Drop from x86-emulate.h too. > --- > tools/include/xen-tools/common-macros.h | 1 + > tools/libs/light/libxl_internal.h | 2 -- > tools/tests/x86_emulator/x86-emulate.h | 3 --- > 3 files changed, 1 insertion(+), 5 deletions(-) > > diff --git a/tools/include/xen-tools/common-macros.h b/tools/include/xen-tools/common-macros.h > index d53b88182560..168691be0e93 100644 > --- a/tools/include/xen-tools/common-macros.h > +++ b/tools/include/xen-tools/common-macros.h > @@ -73,6 +73,7 @@ > #endif > > #define MASK_EXTR(v, m) (((v) & (m)) / ((m) & -(m))) > +#define MASK_INSR(v, m) (((v) * ((m) & -(m))) & (m)) > > #ifndef __must_check > #define __must_check __attribute__((__warn_unused_result__)) > diff --git a/tools/libs/light/libxl_internal.h b/tools/libs/light/libxl_internal.h > index 8aba3e138909..61f4fe1dec55 100644 > --- a/tools/libs/light/libxl_internal.h > +++ b/tools/libs/light/libxl_internal.h > @@ -132,8 +132,6 @@ > > #define DIV_ROUNDUP(n, d) (((n) + (d) - 1) / (d)) > > -#define MASK_INSR(v, m) (((v) * ((m) & -(m))) & (m)) > - > #define LIBXL__LOGGING_ENABLED > > #ifdef LIBXL__LOGGING_ENABLED > diff --git a/tools/tests/x86_emulator/x86-emulate.h b/tools/tests/x86_emulator/x86-emulate.h > index de1f82668010..aa1ed75ec890 100644 > --- a/tools/tests/x86_emulator/x86-emulate.h > +++ b/tools/tests/x86_emulator/x86-emulate.h > @@ -51,9 +51,6 @@ > #define DEFINE_PER_CPU(type, var) type per_cpu_##var > #define this_cpu(var) per_cpu_##var > > -#define MASK_EXTR(v, m) (((v) & (m)) / ((m) & -(m))) > -#define MASK_INSR(v, m) (((v) * ((m) & -(m))) & (m)) > - > #define __init > #define __maybe_unused __attribute__((__unused__)) >
> On 9 Jun 2023, at 11:11, Andrew Cooper <andrew.cooper3@citrix.com> wrote: > > MASK_EXTR() and MASK_INSR() are a matching pair. Keep them together. > > Drop the pair from x86-emulate.h which includes common-macros.h. > > Fixes: 56a7aaa16bfe ("tools: add physinfo arch_capabilities handling for Arm") > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> I think you forgot to retain my R-by: Reviewed-by: Luca Fancellu <luca.fancellu@arm.com> > --- > CC: Anthony PERARD <anthony.perard@citrix.com> > CC: Juergen Gross <jgross@suse.com> > CC: Luca Fancellu <luca.fancellu@arm.com> > CC: Jan Beulich <JBeulich@suse.com> > CC: Roger Pau Monné <roger.pau@citrix.com> > CC: Wei Liu <wl@xen.org> > > v2: > * Drop from x86-emulate.h too. > --- > tools/include/xen-tools/common-macros.h | 1 + > tools/libs/light/libxl_internal.h | 2 -- > tools/tests/x86_emulator/x86-emulate.h | 3 --- > 3 files changed, 1 insertion(+), 5 deletions(-) > > diff --git a/tools/include/xen-tools/common-macros.h b/tools/include/xen-tools/common-macros.h > index d53b88182560..168691be0e93 100644 > --- a/tools/include/xen-tools/common-macros.h > +++ b/tools/include/xen-tools/common-macros.h > @@ -73,6 +73,7 @@ > #endif > > #define MASK_EXTR(v, m) (((v) & (m)) / ((m) & -(m))) > +#define MASK_INSR(v, m) (((v) * ((m) & -(m))) & (m)) > > #ifndef __must_check > #define __must_check __attribute__((__warn_unused_result__)) > diff --git a/tools/libs/light/libxl_internal.h b/tools/libs/light/libxl_internal.h > index 8aba3e138909..61f4fe1dec55 100644 > --- a/tools/libs/light/libxl_internal.h > +++ b/tools/libs/light/libxl_internal.h > @@ -132,8 +132,6 @@ > > #define DIV_ROUNDUP(n, d) (((n) + (d) - 1) / (d)) > > -#define MASK_INSR(v, m) (((v) * ((m) & -(m))) & (m)) > - > #define LIBXL__LOGGING_ENABLED > > #ifdef LIBXL__LOGGING_ENABLED > diff --git a/tools/tests/x86_emulator/x86-emulate.h b/tools/tests/x86_emulator/x86-emulate.h > index de1f82668010..aa1ed75ec890 100644 > --- a/tools/tests/x86_emulator/x86-emulate.h > +++ b/tools/tests/x86_emulator/x86-emulate.h > @@ -51,9 +51,6 @@ > #define DEFINE_PER_CPU(type, var) type per_cpu_##var > #define this_cpu(var) per_cpu_##var > > -#define MASK_EXTR(v, m) (((v) & (m)) / ((m) & -(m))) > -#define MASK_INSR(v, m) (((v) * ((m) & -(m))) & (m)) > - > #define __init > #define __maybe_unused __attribute__((__unused__)) > > -- > 2.30.2 >
On 09/06/2023 11:22 am, Luca Fancellu wrote: > >> On 9 Jun 2023, at 11:11, Andrew Cooper <andrew.cooper3@citrix.com> wrote: >> >> MASK_EXTR() and MASK_INSR() are a matching pair. Keep them together. >> >> Drop the pair from x86-emulate.h which includes common-macros.h. >> >> Fixes: 56a7aaa16bfe ("tools: add physinfo arch_capabilities handling for Arm") >> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> > I think you forgot to retain my R-by: > > Reviewed-by: Luca Fancellu <luca.fancellu@arm.com> I did. I'm very sorry. I need more coffee. Thanks, ~Andrew
On Fri, Jun 09, 2023 at 11:11:05AM +0100, Andrew Cooper wrote: > MASK_EXTR() and MASK_INSR() are a matching pair. Keep them together. > > Drop the pair from x86-emulate.h which includes common-macros.h. > > Fixes: 56a7aaa16bfe ("tools: add physinfo arch_capabilities handling for Arm") > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> Acked-by: Roger Pau Monné <roger.pau@citrix.com> Thanks, Roger.
On Fri, Jun 9, 2023 at 6:11 AM Andrew Cooper <andrew.cooper3@citrix.com> wrote: > > MASK_EXTR() and MASK_INSR() are a matching pair. Keep them together. > > Drop the pair from x86-emulate.h which includes common-macros.h. > > Fixes: 56a7aaa16bfe ("tools: add physinfo arch_capabilities handling for Arm") > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> Reviewed-by: Jason Andryuk <jandryuk@gmail.com> I have (and will now be dropping) an equivalent patch for my forthcoming HWP v4 series. Thanks, Jason
diff --git a/tools/include/xen-tools/common-macros.h b/tools/include/xen-tools/common-macros.h index d53b88182560..168691be0e93 100644 --- a/tools/include/xen-tools/common-macros.h +++ b/tools/include/xen-tools/common-macros.h @@ -73,6 +73,7 @@ #endif #define MASK_EXTR(v, m) (((v) & (m)) / ((m) & -(m))) +#define MASK_INSR(v, m) (((v) * ((m) & -(m))) & (m)) #ifndef __must_check #define __must_check __attribute__((__warn_unused_result__)) diff --git a/tools/libs/light/libxl_internal.h b/tools/libs/light/libxl_internal.h index 8aba3e138909..61f4fe1dec55 100644 --- a/tools/libs/light/libxl_internal.h +++ b/tools/libs/light/libxl_internal.h @@ -132,8 +132,6 @@ #define DIV_ROUNDUP(n, d) (((n) + (d) - 1) / (d)) -#define MASK_INSR(v, m) (((v) * ((m) & -(m))) & (m)) - #define LIBXL__LOGGING_ENABLED #ifdef LIBXL__LOGGING_ENABLED diff --git a/tools/tests/x86_emulator/x86-emulate.h b/tools/tests/x86_emulator/x86-emulate.h index de1f82668010..aa1ed75ec890 100644 --- a/tools/tests/x86_emulator/x86-emulate.h +++ b/tools/tests/x86_emulator/x86-emulate.h @@ -51,9 +51,6 @@ #define DEFINE_PER_CPU(type, var) type per_cpu_##var #define this_cpu(var) per_cpu_##var -#define MASK_EXTR(v, m) (((v) & (m)) / ((m) & -(m))) -#define MASK_INSR(v, m) (((v) * ((m) & -(m))) & (m)) - #define __init #define __maybe_unused __attribute__((__unused__))
MASK_EXTR() and MASK_INSR() are a matching pair. Keep them together. Drop the pair from x86-emulate.h which includes common-macros.h. Fixes: 56a7aaa16bfe ("tools: add physinfo arch_capabilities handling for Arm") Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> --- CC: Anthony PERARD <anthony.perard@citrix.com> CC: Juergen Gross <jgross@suse.com> CC: Luca Fancellu <luca.fancellu@arm.com> CC: Jan Beulich <JBeulich@suse.com> CC: Roger Pau Monné <roger.pau@citrix.com> CC: Wei Liu <wl@xen.org> v2: * Drop from x86-emulate.h too. --- tools/include/xen-tools/common-macros.h | 1 + tools/libs/light/libxl_internal.h | 2 -- tools/tests/x86_emulator/x86-emulate.h | 3 --- 3 files changed, 1 insertion(+), 5 deletions(-)