[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v2] tools: Move MASK_INSR to common-macros.h
- To: Xen-devel <xen-devel@xxxxxxxxxxxxxxxxxxxx>
- From: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
- Date: Fri, 9 Jun 2023 11:13:36 +0100
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none
- Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Ul/fQ4UrBZ+wAke+ySmgGeM8anjZv5AWRY7n6/qNx/0=; b=jcAUpwV9ZTJIO5kj7KARHStpBXXDYcDGdqGS3Npd2hcupqWkSJbTWi5NSrMDnRTOT6ArM+tGe4CQgHQvpxZqCvfh36n0EKjMV/dihUhFDvL+t+oDwffm+2rbIPT343XQXR1gaphjDcEkmINi4zQKxFStYJXKkrEQtdQwLOsgrSrq6l7yY2tSML4LsQ7tE5GBXcnNNtMrECUaJ1YyszmkKdXCPIX3nU5hpuMVeCz2aHQgO/CKCi5XyX2cp6dFIJi5kcgHTfmjpy34SqNg97hqpSdGSYuW/4tuIbGPOG0O9w9r0GwXuzgMM/iKIlMscHS6o6/bqFtrR7uowIdZ1F5xPg==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aYD1Dh7YAdiVSNpNT5TfMPNSbKA2r6Lfqz0UQJfxVYIBC2NB6B2lXneD4Cqfv9cq5VTA1ppWQdToFxDCzSyj0CBzDjpuI7ynWXgizaZ4XWKRLaSamOR49mvN5wcRj7UTm7syAayNzMlg5U3K7URzo9HDGLpdUGyi7DXthweeQr8kYsxU8xE9S7+lhtJcqefod/XcMAMCgwIrDq3klrJqGzVtQiBk2Jgenz8Iuj255mnR97Sqxi0SXQMUvY5u/knwq+fMY0CMSiCo03rsrGYjgazlR9wrBmEyoh64CutBAvxOexdpLmUzOjCkUNrhIs9nkcdoDlbrqcVu0drXvOSSNg==
- Authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com;
- Cc: Anthony PERARD <anthony.perard@xxxxxxxxxx>, Juergen Gross <jgross@xxxxxxxx>, Luca Fancellu <luca.fancellu@xxxxxxx>, Jan Beulich <JBeulich@xxxxxxxx>, Roger Pau Monné <roger.pau@xxxxxxxxxx>, Wei Liu <wl@xxxxxxx>
- Delivery-date: Fri, 09 Jun 2023 10:14:08 +0000
- Ironport-data: A9a23:yLm7IqrYMaTqoNpann96V7cbhydeBmLSZBIvgKrLsJaIsI4StFCzt garIBmOOPiLY2H0eN5+bITi90oG7JHWyNBqHQFv/C80H3sT8ZuZCYyVIHmrMnLJJKUvbq7FA +Y2MYCccZ9uHhcwgj/3b9ANeFEljfngqoLUUbKCYWYpA1c/Ek/NsDo788YhmIlknNOlNA2Ev NL2sqX3NUSsnjV5KQr40YrawP9UlKq04GtwUmAWP6gR5weAzylNV/rzGInqR5fGatgMdgKFb 76rIIGRpgvx4xorA9W5pbf3GmVirmn6ZFXmZtJ+AsBOszAazsAA+v9T2Mk0MC+7vw6hjdFpo OihgLTrIesf0g8gr8xGO/VQO3kW0aSrY9YrK1Dn2SCY5xWun3cBX5yCpaz5VGEV0r8fPI1Ay RAXABwvLR6BqOK1/Jy2b9F0q9ogL5jlP5xK7xmMzRmBZRonabbqZv2QoPN9h3I3jM0IGuvCb c0EbzYpdA7HfxBEJlYQDtQ5gfusgX78NTZfrTp5p4JuuzSVkFM3jearbIK9lt+iHK25mm6xo G7c8nu/KRYdLNGFkhKO8262h/+JliT+MG4XPOThrq822AzImgT/DjU3UGTn8Lqp1ne9QuoYN 2sP8BcBkrkLoRnDot7VGkfQTGS/lg4RXZ9cHvM37CmJy7HI+ECJC24cVDlDZdc68sgsSlQC1 FCTmMjyLSdyq7DTQnWYnp+QsDi7fyYcK2QPYSsZZQIf5p/op4RbpjDlQ8tnEaW1psboAjy2y DePxAAhg50DgMhN0L+0lW0rmBqpr5nNCwIwvQPeWzr/6hsjPNL9IYu19VLc8PBMap6DSUWMt 2QFnM7Y6/0SCZaKl2qGR+Bl8KyV2stp+Qb02TZHd6TNPRz0k5J/Vei8OA1DGXo=
- Ironport-hdrordr: A9a23:dGyRpKg6O24cU9oRVdD85BpO8nBQXmEji2hC6mlwRA09TyVXra GTdZMgpHnJYVcqKRYdcLW7UpVoLkmwyXcY2+Us1PKZLWrbUIXBFvAf0WKg+UycJ8XGntQtqp uICpIOduEYb2IbsS+K2njdLz96+qj/zEnAv463pEuFDzsaCZ2IiT0XNu/xKDwSeOApP/QE/b Onl7t6jgvlV3QLT9ixQkIIV/LEoLTw5ejbSC9DKR47yRWEyQil4r7iExSew34lIkhy6IZn32 jZshDzop6uufGjyhPayiv64plMlMH6o+EzdPCku4w6KijMlg3tXohnVrGY1QpF2N2S1A==
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
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@xxxxxxxxxx>
> ---
> CC: Anthony PERARD <anthony.perard@xxxxxxxxxx>
> CC: Juergen Gross <jgross@xxxxxxxx>
> CC: Luca Fancellu <luca.fancellu@xxxxxxx>
> CC: Jan Beulich <JBeulich@xxxxxxxx>
> CC: Roger Pau Monné <roger.pau@xxxxxxxxxx>
> CC: Wei Liu <wl@xxxxxxx>
>
> 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__))
>
|
