[PATCH] build: Drop CONFIG_$ARCH_$(XEN_OS) definitions

Andrew Cooper posted 1 patch 10 months, 1 week ago
Patches applied successfully (tree, apply log)
git fetch https://gitlab.com/xen-project/patchew/xen tags/patchew/20230619180614.3610284-1-andrew.cooper3@citrix.com
config/arm32.mk   | 1 -
config/arm64.mk   | 1 -
config/riscv64.mk | 1 -
config/x86_32.mk  | 1 -
config/x86_64.mk  | 1 -
5 files changed, 5 deletions(-)
[PATCH] build: Drop CONFIG_$ARCH_$(XEN_OS) definitions
Posted by Andrew Cooper 10 months, 1 week ago
These aren't used, and are not obvious useful either.

tools/ does have some logic which works on $(XEN_OS) directly, and some on
CONFIG_$(XEN_OS) too, but this isn't how we typically refer to things.

The only user ever of this scheme was introduced in c0fd920e987 (2006) and
deleted in fa2244104b4 (2010).

No functional change.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Jan Beulich <JBeulich@suse.com>
CC: Roger Pau Monné <roger.pau@citrix.com>
CC: Wei Liu <wl@xen.org>
CC: Stefano Stabellini <sstabellini@kernel.org>
CC: Julien Grall <julien@xen.org>
CC: Volodymyr Babchuk <Volodymyr_Babchuk@epam.com>
CC: Bertrand Marquis <bertrand.marquis@arm.com>
CC: Bob Eshleman <bobbyeshleman@gmail.com>
CC: Alistair Francis <alistair.francis@wdc.com>
CC: Connor Davis <connojdavis@gmail.com>
CC: Oleksii Kurochko <oleksii.kurochko@gmail.com>
CC: Shawn Anastasio <sanastasio@raptorengineering.com>

The necessary rune is:

  git grep -E "CONFIG_(X86|ARM|RISCV)_(FreeBSD|Linux|MiniOS|NetBSD|OpenBSD|SunOS)"
---
 config/arm32.mk   | 1 -
 config/arm64.mk   | 1 -
 config/riscv64.mk | 1 -
 config/x86_32.mk  | 1 -
 config/x86_64.mk  | 1 -
 5 files changed, 5 deletions(-)

diff --git a/config/arm32.mk b/config/arm32.mk
index f95228e3c079..c38d89cb30fc 100644
--- a/config/arm32.mk
+++ b/config/arm32.mk
@@ -1,6 +1,5 @@
 CONFIG_ARM := y
 CONFIG_ARM_32 := y
-CONFIG_ARM_$(XEN_OS) := y
 
 CONFIG_XEN_INSTALL_SUFFIX :=
 
diff --git a/config/arm64.mk b/config/arm64.mk
index aa45772b6173..c4662f67d044 100644
--- a/config/arm64.mk
+++ b/config/arm64.mk
@@ -1,6 +1,5 @@
 CONFIG_ARM := y
 CONFIG_ARM_64 := y
-CONFIG_ARM_$(XEN_OS) := y
 
 CONFIG_XEN_INSTALL_SUFFIX :=
 
diff --git a/config/riscv64.mk b/config/riscv64.mk
index a5a21e5fa220..91c6e53da6f8 100644
--- a/config/riscv64.mk
+++ b/config/riscv64.mk
@@ -1,5 +1,4 @@
 CONFIG_RISCV := y
 CONFIG_RISCV_64 := y
-CONFIG_RISCV_$(XEN_OS) := y
 
 CONFIG_XEN_INSTALL_SUFFIX :=
diff --git a/config/x86_32.mk b/config/x86_32.mk
index bc96ff013d74..3cc046d9bcf3 100644
--- a/config/x86_32.mk
+++ b/config/x86_32.mk
@@ -1,6 +1,5 @@
 CONFIG_X86 := y
 CONFIG_X86_32 := y
-CONFIG_X86_$(XEN_OS) := y
 
 CONFIG_MIGRATE := y
 CONFIG_XCUTILS := y
diff --git a/config/x86_64.mk b/config/x86_64.mk
index 4afef4414129..8614457b03d0 100644
--- a/config/x86_64.mk
+++ b/config/x86_64.mk
@@ -1,6 +1,5 @@
 CONFIG_X86 := y
 CONFIG_X86_64 := y
-CONFIG_X86_$(XEN_OS) := y
 
 CONFIG_MIGRATE := y
 CONFIG_XCUTILS := y

base-commit: 43e863a02d81f5fff32763b23d2a39f041f7e62b
-- 
2.30.2


Re: [PATCH] build: Drop CONFIG_$ARCH_$(XEN_OS) definitions
Posted by Alistair Francis 10 months, 1 week ago
On Tue, Jun 20, 2023 at 4:07 AM Andrew Cooper <andrew.cooper3@citrix.com> wrote:
>
> These aren't used, and are not obvious useful either.
>
> tools/ does have some logic which works on $(XEN_OS) directly, and some on
> CONFIG_$(XEN_OS) too, but this isn't how we typically refer to things.
>
> The only user ever of this scheme was introduced in c0fd920e987 (2006) and
> deleted in fa2244104b4 (2010).
>
> No functional change.
>
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

Alistair

> ---
> CC: Jan Beulich <JBeulich@suse.com>
> CC: Roger Pau Monné <roger.pau@citrix.com>
> CC: Wei Liu <wl@xen.org>
> CC: Stefano Stabellini <sstabellini@kernel.org>
> CC: Julien Grall <julien@xen.org>
> CC: Volodymyr Babchuk <Volodymyr_Babchuk@epam.com>
> CC: Bertrand Marquis <bertrand.marquis@arm.com>
> CC: Bob Eshleman <bobbyeshleman@gmail.com>
> CC: Alistair Francis <alistair.francis@wdc.com>
> CC: Connor Davis <connojdavis@gmail.com>
> CC: Oleksii Kurochko <oleksii.kurochko@gmail.com>
> CC: Shawn Anastasio <sanastasio@raptorengineering.com>
>
> The necessary rune is:
>
>   git grep -E "CONFIG_(X86|ARM|RISCV)_(FreeBSD|Linux|MiniOS|NetBSD|OpenBSD|SunOS)"
> ---
>  config/arm32.mk   | 1 -
>  config/arm64.mk   | 1 -
>  config/riscv64.mk | 1 -
>  config/x86_32.mk  | 1 -
>  config/x86_64.mk  | 1 -
>  5 files changed, 5 deletions(-)
>
> diff --git a/config/arm32.mk b/config/arm32.mk
> index f95228e3c079..c38d89cb30fc 100644
> --- a/config/arm32.mk
> +++ b/config/arm32.mk
> @@ -1,6 +1,5 @@
>  CONFIG_ARM := y
>  CONFIG_ARM_32 := y
> -CONFIG_ARM_$(XEN_OS) := y
>
>  CONFIG_XEN_INSTALL_SUFFIX :=
>
> diff --git a/config/arm64.mk b/config/arm64.mk
> index aa45772b6173..c4662f67d044 100644
> --- a/config/arm64.mk
> +++ b/config/arm64.mk
> @@ -1,6 +1,5 @@
>  CONFIG_ARM := y
>  CONFIG_ARM_64 := y
> -CONFIG_ARM_$(XEN_OS) := y
>
>  CONFIG_XEN_INSTALL_SUFFIX :=
>
> diff --git a/config/riscv64.mk b/config/riscv64.mk
> index a5a21e5fa220..91c6e53da6f8 100644
> --- a/config/riscv64.mk
> +++ b/config/riscv64.mk
> @@ -1,5 +1,4 @@
>  CONFIG_RISCV := y
>  CONFIG_RISCV_64 := y
> -CONFIG_RISCV_$(XEN_OS) := y
>
>  CONFIG_XEN_INSTALL_SUFFIX :=
> diff --git a/config/x86_32.mk b/config/x86_32.mk
> index bc96ff013d74..3cc046d9bcf3 100644
> --- a/config/x86_32.mk
> +++ b/config/x86_32.mk
> @@ -1,6 +1,5 @@
>  CONFIG_X86 := y
>  CONFIG_X86_32 := y
> -CONFIG_X86_$(XEN_OS) := y
>
>  CONFIG_MIGRATE := y
>  CONFIG_XCUTILS := y
> diff --git a/config/x86_64.mk b/config/x86_64.mk
> index 4afef4414129..8614457b03d0 100644
> --- a/config/x86_64.mk
> +++ b/config/x86_64.mk
> @@ -1,6 +1,5 @@
>  CONFIG_X86 := y
>  CONFIG_X86_64 := y
> -CONFIG_X86_$(XEN_OS) := y
>
>  CONFIG_MIGRATE := y
>  CONFIG_XCUTILS := y
>
> base-commit: 43e863a02d81f5fff32763b23d2a39f041f7e62b
> --
> 2.30.2
>
>
Re: [PATCH] build: Drop CONFIG_$ARCH_$(XEN_OS) definitions
Posted by Stefano Stabellini 10 months, 1 week ago
On Mon, 19 Jun 2023, Andrew Cooper wrote:
> These aren't used, and are not obvious useful either.
> 
> tools/ does have some logic which works on $(XEN_OS) directly, and some on
> CONFIG_$(XEN_OS) too, but this isn't how we typically refer to things.
> 
> The only user ever of this scheme was introduced in c0fd920e987 (2006) and
> deleted in fa2244104b4 (2010).
> 
> No functional change.
> 
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

Acked-by: Stefano Stabellini <sstabellini@kernel.org>


> ---
> CC: Jan Beulich <JBeulich@suse.com>
> CC: Roger Pau Monné <roger.pau@citrix.com>
> CC: Wei Liu <wl@xen.org>
> CC: Stefano Stabellini <sstabellini@kernel.org>
> CC: Julien Grall <julien@xen.org>
> CC: Volodymyr Babchuk <Volodymyr_Babchuk@epam.com>
> CC: Bertrand Marquis <bertrand.marquis@arm.com>
> CC: Bob Eshleman <bobbyeshleman@gmail.com>
> CC: Alistair Francis <alistair.francis@wdc.com>
> CC: Connor Davis <connojdavis@gmail.com>
> CC: Oleksii Kurochko <oleksii.kurochko@gmail.com>
> CC: Shawn Anastasio <sanastasio@raptorengineering.com>
> 
> The necessary rune is:
> 
>   git grep -E "CONFIG_(X86|ARM|RISCV)_(FreeBSD|Linux|MiniOS|NetBSD|OpenBSD|SunOS)"
> ---
>  config/arm32.mk   | 1 -
>  config/arm64.mk   | 1 -
>  config/riscv64.mk | 1 -
>  config/x86_32.mk  | 1 -
>  config/x86_64.mk  | 1 -
>  5 files changed, 5 deletions(-)
> 
> diff --git a/config/arm32.mk b/config/arm32.mk
> index f95228e3c079..c38d89cb30fc 100644
> --- a/config/arm32.mk
> +++ b/config/arm32.mk
> @@ -1,6 +1,5 @@
>  CONFIG_ARM := y
>  CONFIG_ARM_32 := y
> -CONFIG_ARM_$(XEN_OS) := y
>  
>  CONFIG_XEN_INSTALL_SUFFIX :=
>  
> diff --git a/config/arm64.mk b/config/arm64.mk
> index aa45772b6173..c4662f67d044 100644
> --- a/config/arm64.mk
> +++ b/config/arm64.mk
> @@ -1,6 +1,5 @@
>  CONFIG_ARM := y
>  CONFIG_ARM_64 := y
> -CONFIG_ARM_$(XEN_OS) := y
>  
>  CONFIG_XEN_INSTALL_SUFFIX :=
>  
> diff --git a/config/riscv64.mk b/config/riscv64.mk
> index a5a21e5fa220..91c6e53da6f8 100644
> --- a/config/riscv64.mk
> +++ b/config/riscv64.mk
> @@ -1,5 +1,4 @@
>  CONFIG_RISCV := y
>  CONFIG_RISCV_64 := y
> -CONFIG_RISCV_$(XEN_OS) := y
>  
>  CONFIG_XEN_INSTALL_SUFFIX :=
> diff --git a/config/x86_32.mk b/config/x86_32.mk
> index bc96ff013d74..3cc046d9bcf3 100644
> --- a/config/x86_32.mk
> +++ b/config/x86_32.mk
> @@ -1,6 +1,5 @@
>  CONFIG_X86 := y
>  CONFIG_X86_32 := y
> -CONFIG_X86_$(XEN_OS) := y
>  
>  CONFIG_MIGRATE := y
>  CONFIG_XCUTILS := y
> diff --git a/config/x86_64.mk b/config/x86_64.mk
> index 4afef4414129..8614457b03d0 100644
> --- a/config/x86_64.mk
> +++ b/config/x86_64.mk
> @@ -1,6 +1,5 @@
>  CONFIG_X86 := y
>  CONFIG_X86_64 := y
> -CONFIG_X86_$(XEN_OS) := y
>  
>  CONFIG_MIGRATE := y
>  CONFIG_XCUTILS := y
> 
> base-commit: 43e863a02d81f5fff32763b23d2a39f041f7e62b
> -- 
> 2.30.2
> 
Re: [PATCH] build: Drop CONFIG_$ARCH_$(XEN_OS) definitions
Posted by Oleksii 10 months, 1 week ago
On Mon, 2023-06-19 at 19:06 +0100, Andrew Cooper wrote:
> These aren't used, and are not obvious useful either.
> 
> tools/ does have some logic which works on $(XEN_OS) directly, and
> some on
> CONFIG_$(XEN_OS) too, but this isn't how we typically refer to
> things.
> 
> The only user ever of this scheme was introduced in c0fd920e987
> (2006) and
> deleted in fa2244104b4 (2010).
> 
> No functional change.

Looks fine to me.

Reviewed-by: Oleksii Kurochko <oleksii.kurochko@gmail.com>

~ Oleksii
Re: [PATCH] build: Drop CONFIG_$ARCH_$(XEN_OS) definitions
Posted by Jiamei Xie 10 months, 1 week ago
Hi Andrew,

On 2023/6/20 02:06, Andrew Cooper wrote:
> These aren't used, and are not obvious useful either.
>
> tools/ does have some logic which works on $(XEN_OS) directly, and some on
> CONFIG_$(XEN_OS) too, but this isn't how we typically refer to things.
>
> The only user ever of this scheme was introduced in c0fd920e987 (2006) and
> deleted in fa2244104b4 (2010).
>
> No functional change.
>
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
>
>
I run it on fvp_base_revc. It works fine.

Tested-by: Jiamei Xie <jiamei.xie@arm.com <mailto:jiamei.xie@arm.com>

Best wishes,

Jiamei

Re: [PATCH] build: Drop CONFIG_$ARCH_$(XEN_OS) definitions
Posted by Jan Beulich 10 months, 1 week ago
On 19.06.2023 20:06, Andrew Cooper wrote:
> These aren't used, and are not obvious useful either.
> 
> tools/ does have some logic which works on $(XEN_OS) directly, and some on
> CONFIG_$(XEN_OS) too, but this isn't how we typically refer to things.
> 
> The only user ever of this scheme was introduced in c0fd920e987 (2006) and
> deleted in fa2244104b4 (2010).
> 
> No functional change.
> 
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

Reviewed-by: Jan Beulich <jbeulich@suse.com>