[PATCH 0/4] Drips and drabs

[PATCH 0/4] Drips and drabs

[Chuck Lever]

Here are some patches that begin adding support for aarch64 with
libguestfs. It's not fully working yet, but these seem sensible
enough to start with.

---

Chuck Lever (4):
      linux: Add the 5.15.y stable branch
      Kconfig: Remove unused Kconfig option
      Kconfig: Default value of TARGET_ARCHITECTURE
      libvirt: Select qemu executable based on host architecture


 kconfigs/Kconfig.libvirt             |  2 +-
 kconfigs/arch/Kconfig                | 14 ++++++++------
 scripts/get_libvirt_qemu_bin_path.sh |  3 +++
 scripts/get_target_arch.sh           | 14 ++++++++++++++
 workflows/linux/Kconfig.stable       |  6 ++++++
 5 files changed, 32 insertions(+), 7 deletions(-)
 create mode 100755 scripts/get_libvirt_qemu_bin_path.sh
 create mode 100755 scripts/get_target_arch.sh

--
Chuck Lever

[PATCH 1/4] linux: Add the 5.15.y stable branch

[Chuck Lever]

From: Chuck Lever <chuck.lever@oracle.com>

The v5.15.y branch is a long-term stable kernel that needs
regular testing. Make it easy to pull and build.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
 workflows/linux/Kconfig.stable |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/workflows/linux/Kconfig.stable b/workflows/linux/Kconfig.stable
index 39c1984a0630..10528a9cc6e1 100644
--- a/workflows/linux/Kconfig.stable
+++ b/workflows/linux/Kconfig.stable
@@ -37,6 +37,11 @@ config BOOTLINUX_STABLE_V514
 	help
 	  Automatically enable the latest supported linux-5.14.y kernel.
 
+config BOOTLINUX_STABLE_V515
+	bool "linux-5.15.y"
+	help
+	  Automatically enable the latest supported linux-5.15.y kernel.
+
 config BOOTLINUX_STABLE_V517
 	bool "linux-5.17.y"
 	help
@@ -72,6 +77,7 @@ config BOOTLINUX_TREE_STABLE_TAG
 	default "v5.4.210" if BOOTLINUX_STABLE_V54
 	default "v5.10.105" if BOOTLINUX_STABLE_V510
 	default "v5.14.4" if BOOTLINUX_STABLE_V514
+	default "v5.15.148" if BOOTLINUX_STABLE_V515
 	default "v5.17-rc7" if BOOTLINUX_STABLE_V517
 	default "v5.19-rc4" if BOOTLINUX_STABLE_V519
 	default "v6.0.9" if BOOTLINUX_STABLE_V60

[PATCH 2/4] Kconfig: Remove unused Kconfig option

[Chuck Lever]

From: Chuck Lever <chuck.lever@oracle.com>

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
 kconfigs/arch/Kconfig |    5 -----
 1 file changed, 5 deletions(-)

diff --git a/kconfigs/arch/Kconfig b/kconfigs/arch/Kconfig
index 6a89af2ca576..a133bc3f3c3a 100644
--- a/kconfigs/arch/Kconfig
+++ b/kconfigs/arch/Kconfig
@@ -34,8 +34,3 @@ endchoice
 # a kdevops'ism, it does not exist on the Linux kernel.
 config HAVE_ARCH_64K_PAGES
         bool
-
-config TARGET_ARCH
-        string
-	default "x86_64" if TARGET_ARCH_X86_64
-	default "ppc64le" if TARGET_ARCH_PPC64LE

[PATCH 3/4] Kconfig: Default value of TARGET_ARCHITECTURE

[Chuck Lever]

From: Chuck Lever <chuck.lever@oracle.com>

The default value of the TARGET_ARCHITECTURE Kconfig option should
be the same as the host's platform architecture. The cases where
these would not match are few.

Suggested-by: Luis Chamberlain <mcgrof@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
 kconfigs/arch/Kconfig      |    9 ++++++++-
 scripts/get_target_arch.sh |   14 ++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100755 scripts/get_target_arch.sh

diff --git a/kconfigs/arch/Kconfig b/kconfigs/arch/Kconfig
index a133bc3f3c3a..4c0beaf7c1f5 100644
--- a/kconfigs/arch/Kconfig
+++ b/kconfigs/arch/Kconfig
@@ -1,6 +1,13 @@
 choice
 	prompt "Target architecture"
-	default TARGET_ARCH_X86_64
+	default $(shell,scripts/get_target_arch.sh)
+	help
+	  Choose the generic platfrom architecture to target during testing.
+	  This setting enables features and workflows for that architecture
+	  and sets sensible defaults.
+
+	  The target host Instruction Set Architecture is selected in the
+	  "Bring up methods" menu.
 
 config TARGET_ARCH_X86_64
 	bool "x86_64"
diff --git a/scripts/get_target_arch.sh b/scripts/get_target_arch.sh
new file mode 100755
index 000000000000..03e1552f68a0
--- /dev/null
+++ b/scripts/get_target_arch.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+# SPDX-License-Identifier: copyleft-next-0.3.1
+
+case `uname -m` in
+  x86_64)
+    echo "TARGET_ARCH_X86_64"
+    ;;
+  aarch64)
+    echo "TARGET_ARCH_ARM64"
+    ;;
+  ppc64le)
+    echo "TARGET_ARCH_PPC64LE"
+    ;;
+esac

[PATCH 4/4] libvirt: Select qemu executable based on host architecture

[Chuck Lever]

From: Chuck Lever <chuck.lever@oracle.com>

Run "qemu-system-x86_64" on x86 systems, and
"qemu-system-aarch64" on ARM systems.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
 kconfigs/Kconfig.libvirt             |    2 +-
 scripts/get_libvirt_qemu_bin_path.sh |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100755 scripts/get_libvirt_qemu_bin_path.sh

diff --git a/kconfigs/Kconfig.libvirt b/kconfigs/Kconfig.libvirt
index 10aea4010869..fa39120450fd 100644
--- a/kconfigs/Kconfig.libvirt
+++ b/kconfigs/Kconfig.libvirt
@@ -164,7 +164,7 @@ config KDEVOPS_STORAGE_POOL_PATH
 config QEMU_BIN_PATH
 	string
 	default QEMU_BIN_PATH_LIBVIRT if LIBVIRT
-	default "/usr/bin/qemu-system-x86_64" if !LIBVIRT
+	default $(shell,./scripts/get_libvirt_qemu_bin_path.sh) if !QEMU_USE_DEVELOPMENT_VERSION
 
 config LIBVIRT_URI
 	string
diff --git a/scripts/get_libvirt_qemu_bin_path.sh b/scripts/get_libvirt_qemu_bin_path.sh
new file mode 100755
index 000000000000..14c0d9a70cf1
--- /dev/null
+++ b/scripts/get_libvirt_qemu_bin_path.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+# SPDX-License-Identifier: copyleft-next-0.3.1
+echo "/usr/bin/qemu-system-"`uname -m`

Re: [PATCH 0/4] Drips and drabs

[Luis Chamberlain]

On Thu, Feb 22, 2024 at 10:25:59AM -0500, Chuck Lever wrote:
> Here are some patches that begin adding support for aarch64 with
> libguestfs. It's not fully working yet, but these seem sensible
> enough to start with.
> 
> ---
> 
> Chuck Lever (4):
>       linux: Add the 5.15.y stable branch
>       Kconfig: Remove unused Kconfig option
>       Kconfig: Default value of TARGET_ARCHITECTURE
>       libvirt: Select qemu executable based on host architecture
> 

All look good to me, however Daniel Gomez's new ref tag stuff may
conflict with patch #1, so its unclear if this should go in as is
or we shoud wait for Daniel's changes as it woud allow you later to
easily bump the extra version for a stable kernel. That's a feature
which I think Amir has also been yearning for.

Acked-by: Luis Chamberlain <mcgrof@kernel.org>

  Luis

Re: [PATCH 0/4] Drips and drabs

[Daniel Gomez]

On Thu, Feb 22, 2024 at 07:35:40AM -0800, Luis Chamberlain wrote:
> On Thu, Feb 22, 2024 at 10:25:59AM -0500, Chuck Lever wrote:
> > Here are some patches that begin adding support for aarch64 with
> > libguestfs. It's not fully working yet, but these seem sensible
> > enough to start with.
> > 
> > ---
> > 
> > Chuck Lever (4):
> >       linux: Add the 5.15.y stable branch
> >       Kconfig: Remove unused Kconfig option
> >       Kconfig: Default value of TARGET_ARCHITECTURE
> >       libvirt: Select qemu executable based on host architecture
> > 
> 
> All look good to me, however Daniel Gomez's new ref tag stuff may
> conflict with patch #1, so its unclear if this should go in as is
> or we shoud wait for Daniel's changes as it woud allow you later to
> easily bump the extra version for a stable kernel. That's a feature
> which I think Amir has also been yearning for.

I think we can drop that patch Chuck. I would only have to increase the number
of refs to 16 for stable, so the 5.15.y branch is included.

Here the snippet with 16 refs:

config BOOTLINUX_TREE_STABLE_REF
        string
        default "master" if BOOTLINUX_TREE_STABLE_REF_0
        default "linux-rolling-stable" if BOOTLINUX_TREE_STABLE_REF_1
        default "linux-rolling-lts" if BOOTLINUX_TREE_STABLE_REF_2
        default "linux-6.7.y" if BOOTLINUX_TREE_STABLE_REF_3
        default "linux-6.6.y" if BOOTLINUX_TREE_STABLE_REF_4
        default "linux-6.5.y" if BOOTLINUX_TREE_STABLE_REF_5
        default "linux-6.4.y" if BOOTLINUX_TREE_STABLE_REF_6
        default "linux-6.3.y" if BOOTLINUX_TREE_STABLE_REF_7
        default "linux-6.2.y" if BOOTLINUX_TREE_STABLE_REF_8
        default "linux-6.1.y" if BOOTLINUX_TREE_STABLE_REF_9
        default "linux-6.0.y" if BOOTLINUX_TREE_STABLE_REF_10
        default "linux-5.19.y" if BOOTLINUX_TREE_STABLE_REF_11
        default "linux-5.18.y" if BOOTLINUX_TREE_STABLE_REF_12
        default "linux-5.17.y" if BOOTLINUX_TREE_STABLE_REF_13
        default "linux-5.16.y" if BOOTLINUX_TREE_STABLE_REF_14
        default "linux-5.15.y" if BOOTLINUX_TREE_STABLE_REF_15
        default "v6.8-rc5" if BOOTLINUX_TREE_STABLE_REF_16
        default "v6.8-rc4" if BOOTLINUX_TREE_STABLE_REF_17
        default "v6.8-rc3" if BOOTLINUX_TREE_STABLE_REF_18
        default "v6.8-rc2" if BOOTLINUX_TREE_STABLE_REF_19
        default "v6.8-rc1" if BOOTLINUX_TREE_STABLE_REF_20
        default "v6.7.5" if BOOTLINUX_TREE_STABLE_REF_21
        default "v6.7.4" if BOOTLINUX_TREE_STABLE_REF_22
        default "v6.7.3" if BOOTLINUX_TREE_STABLE_REF_23
        default "v6.7.2" if BOOTLINUX_TREE_STABLE_REF_24
        default "v6.7.1" if BOOTLINUX_TREE_STABLE_REF_25
        default "v6.7" if BOOTLINUX_TREE_STABLE_REF_26
        default "v6.7-rc8" if BOOTLINUX_TREE_STABLE_REF_27
        default "v6.7-rc7" if BOOTLINUX_TREE_STABLE_REF_28
        default "v6.7-rc6" if BOOTLINUX_TREE_STABLE_REF_29
        default "v6.7-rc5" if BOOTLINUX_TREE_STABLE_REF_30
        default "v6.7-rc4" if BOOTLINUX_TREE_STABLE_REF_31
> 
> Acked-by: Luis Chamberlain <mcgrof@kernel.org>
> 
>   Luis

Re: [PATCH 0/4] Drips and drabs

[Luis Chamberlain]

On Thu, Feb 22, 2024 at 04:11:53PM +0000, Daniel Gomez wrote:
> On Thu, Feb 22, 2024 at 07:35:40AM -0800, Luis Chamberlain wrote:
> > On Thu, Feb 22, 2024 at 10:25:59AM -0500, Chuck Lever wrote:
> > > Here are some patches that begin adding support for aarch64 with
> > > libguestfs. It's not fully working yet, but these seem sensible
> > > enough to start with.
> > > 
> > > ---
> > > 
> > > Chuck Lever (4):
> > >       linux: Add the 5.15.y stable branch
> > >       Kconfig: Remove unused Kconfig option
> > >       Kconfig: Default value of TARGET_ARCHITECTURE
> > >       libvirt: Select qemu executable based on host architecture
> > > 
> > 
> > All look good to me, however Daniel Gomez's new ref tag stuff may
> > conflict with patch #1, so its unclear if this should go in as is
> > or we shoud wait for Daniel's changes as it woud allow you later to
> > easily bump the extra version for a stable kernel. That's a feature
> > which I think Amir has also been yearning for.
> 
> I think we can drop that patch Chuck. I would only have to increase the number
> of refs to 16 for stable, so the 5.15.y branch is included.
> 
> Here the snippet with 16 refs:
> 
> config BOOTLINUX_TREE_STABLE_REF
>         string
>         default "master" if BOOTLINUX_TREE_STABLE_REF_0
>         default "linux-rolling-stable" if BOOTLINUX_TREE_STABLE_REF_1
>         default "linux-rolling-lts" if BOOTLINUX_TREE_STABLE_REF_2
>         default "linux-6.7.y" if BOOTLINUX_TREE_STABLE_REF_3
>         default "linux-6.6.y" if BOOTLINUX_TREE_STABLE_REF_4
>         default "linux-6.5.y" if BOOTLINUX_TREE_STABLE_REF_5
>         default "linux-6.4.y" if BOOTLINUX_TREE_STABLE_REF_6
>         default "linux-6.3.y" if BOOTLINUX_TREE_STABLE_REF_7
>         default "linux-6.2.y" if BOOTLINUX_TREE_STABLE_REF_8
>         default "linux-6.1.y" if BOOTLINUX_TREE_STABLE_REF_9
>         default "linux-6.0.y" if BOOTLINUX_TREE_STABLE_REF_10
>         default "linux-5.19.y" if BOOTLINUX_TREE_STABLE_REF_11
>         default "linux-5.18.y" if BOOTLINUX_TREE_STABLE_REF_12
>         default "linux-5.17.y" if BOOTLINUX_TREE_STABLE_REF_13
>         default "linux-5.16.y" if BOOTLINUX_TREE_STABLE_REF_14
>         default "linux-5.15.y" if BOOTLINUX_TREE_STABLE_REF_15
>         default "v6.8-rc5" if BOOTLINUX_TREE_STABLE_REF_16
>         default "v6.8-rc4" if BOOTLINUX_TREE_STABLE_REF_17
>         default "v6.8-rc3" if BOOTLINUX_TREE_STABLE_REF_18
>         default "v6.8-rc2" if BOOTLINUX_TREE_STABLE_REF_19
>         default "v6.8-rc1" if BOOTLINUX_TREE_STABLE_REF_20
>         default "v6.7.5" if BOOTLINUX_TREE_STABLE_REF_21
>         default "v6.7.4" if BOOTLINUX_TREE_STABLE_REF_22
>         default "v6.7.3" if BOOTLINUX_TREE_STABLE_REF_23
>         default "v6.7.2" if BOOTLINUX_TREE_STABLE_REF_24
>         default "v6.7.1" if BOOTLINUX_TREE_STABLE_REF_25
>         default "v6.7" if BOOTLINUX_TREE_STABLE_REF_26
>         default "v6.7-rc8" if BOOTLINUX_TREE_STABLE_REF_27
>         default "v6.7-rc7" if BOOTLINUX_TREE_STABLE_REF_28
>         default "v6.7-rc6" if BOOTLINUX_TREE_STABLE_REF_29
>         default "v6.7-rc5" if BOOTLINUX_TREE_STABLE_REF_30
>         default "v6.7-rc4" if BOOTLINUX_TREE_STABLE_REF_31

Perhaps we should not include rc candidates for stabe branches. That
should limit the number of refs needed. Is that easy to do?

  Luis

Re: [PATCH 0/4] Drips and drabs

[Chuck Lever]

On Thu, Feb 22, 2024 at 08:25:15AM -0800, Luis Chamberlain wrote:
> On Thu, Feb 22, 2024 at 04:11:53PM +0000, Daniel Gomez wrote:
> > On Thu, Feb 22, 2024 at 07:35:40AM -0800, Luis Chamberlain wrote:
> > > On Thu, Feb 22, 2024 at 10:25:59AM -0500, Chuck Lever wrote:
> > > > Here are some patches that begin adding support for aarch64 with
> > > > libguestfs. It's not fully working yet, but these seem sensible
> > > > enough to start with.
> > > > 
> > > > ---
> > > > 
> > > > Chuck Lever (4):
> > > >       linux: Add the 5.15.y stable branch
> > > >       Kconfig: Remove unused Kconfig option
> > > >       Kconfig: Default value of TARGET_ARCHITECTURE
> > > >       libvirt: Select qemu executable based on host architecture
> > > > 
> > > 
> > > All look good to me, however Daniel Gomez's new ref tag stuff may
> > > conflict with patch #1, so its unclear if this should go in as is
> > > or we shoud wait for Daniel's changes as it woud allow you later to
> > > easily bump the extra version for a stable kernel. That's a feature
> > > which I think Amir has also been yearning for.
> > 
> > I think we can drop that patch Chuck. I would only have to increase the number
> > of refs to 16 for stable, so the 5.15.y branch is included.
> > 
> > Here the snippet with 16 refs:
> > 
> > config BOOTLINUX_TREE_STABLE_REF
> >         string
> >         default "master" if BOOTLINUX_TREE_STABLE_REF_0
> >         default "linux-rolling-stable" if BOOTLINUX_TREE_STABLE_REF_1
> >         default "linux-rolling-lts" if BOOTLINUX_TREE_STABLE_REF_2
> >         default "linux-6.7.y" if BOOTLINUX_TREE_STABLE_REF_3
> >         default "linux-6.6.y" if BOOTLINUX_TREE_STABLE_REF_4
> >         default "linux-6.5.y" if BOOTLINUX_TREE_STABLE_REF_5
> >         default "linux-6.4.y" if BOOTLINUX_TREE_STABLE_REF_6
> >         default "linux-6.3.y" if BOOTLINUX_TREE_STABLE_REF_7
> >         default "linux-6.2.y" if BOOTLINUX_TREE_STABLE_REF_8
> >         default "linux-6.1.y" if BOOTLINUX_TREE_STABLE_REF_9
> >         default "linux-6.0.y" if BOOTLINUX_TREE_STABLE_REF_10
> >         default "linux-5.19.y" if BOOTLINUX_TREE_STABLE_REF_11
> >         default "linux-5.18.y" if BOOTLINUX_TREE_STABLE_REF_12
> >         default "linux-5.17.y" if BOOTLINUX_TREE_STABLE_REF_13
> >         default "linux-5.16.y" if BOOTLINUX_TREE_STABLE_REF_14
> >         default "linux-5.15.y" if BOOTLINUX_TREE_STABLE_REF_15
> >         default "v6.8-rc5" if BOOTLINUX_TREE_STABLE_REF_16
> >         default "v6.8-rc4" if BOOTLINUX_TREE_STABLE_REF_17
> >         default "v6.8-rc3" if BOOTLINUX_TREE_STABLE_REF_18
> >         default "v6.8-rc2" if BOOTLINUX_TREE_STABLE_REF_19
> >         default "v6.8-rc1" if BOOTLINUX_TREE_STABLE_REF_20
> >         default "v6.7.5" if BOOTLINUX_TREE_STABLE_REF_21
> >         default "v6.7.4" if BOOTLINUX_TREE_STABLE_REF_22
> >         default "v6.7.3" if BOOTLINUX_TREE_STABLE_REF_23
> >         default "v6.7.2" if BOOTLINUX_TREE_STABLE_REF_24
> >         default "v6.7.1" if BOOTLINUX_TREE_STABLE_REF_25
> >         default "v6.7" if BOOTLINUX_TREE_STABLE_REF_26
> >         default "v6.7-rc8" if BOOTLINUX_TREE_STABLE_REF_27
> >         default "v6.7-rc7" if BOOTLINUX_TREE_STABLE_REF_28
> >         default "v6.7-rc6" if BOOTLINUX_TREE_STABLE_REF_29
> >         default "v6.7-rc5" if BOOTLINUX_TREE_STABLE_REF_30
> >         default "v6.7-rc4" if BOOTLINUX_TREE_STABLE_REF_31
> 
> Perhaps we should not include rc candidates for stabe branches. That
> should limit the number of refs needed. Is that easy to do?
> 
>   Luis

Agreed, I prefer pulling the stable branches rather than a tag,
so this is nicer than my patch, which I will drop. I agree the
-rc tags don't add much value over linux-next, and will have to
be actively maintained.

-- 
Chuck Lever